summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'Michael Niedermayer2014-04-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac4b32df71bd932838043a4838b86d11e169707f': On2 VP7 decoder Conflicts: Changelog libavcodec/arm/h264pred_init_arm.c libavcodec/arm/vp8dsp.h libavcodec/arm/vp8dsp_init_arm.c libavcodec/arm/vp8dsp_init_armv6.c libavcodec/arm/vp8dsp_init_neon.c libavcodec/avcodec.h libavcodec/h264pred.c libavcodec/version.h libavcodec/vp8.c libavcodec/vp8.h libavcodec/vp8data.h libavcodec/vp8dsp.c libavcodec/vp8dsp.h libavcodec/x86/h264_intrapred_init.c libavcodec/x86/vp8dsp_init.c See: 89f2f5dbd7a23e7ec1073d3c08d46093a01a4135 and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * On2 VP7 decoderPeter Ross2014-04-04
| | | | | | | | | | | | | | | | | | Further performance improvements and security fixes by Vittorio Giovara, Luca Barbato and Diego Biurrun. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | log: allow color highlighting in Cygwin's minttyJames Darnley2014-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure will detect the availability of the Windows' console functions and set HAVE_SETCONSOLETEXTATTRIBUTE. Meaning av_log will use those functions to control colours. When ffmpeg is run in Cygwin's mintty terminal emulator it will not use colour highlighting in this case. Mintty responds to the usual escape code colours (it even supports 256 colours). Windows' cmd.exe does not. Fortunately it seems that Cygwin's emulation layer now translates the basic 16 colours into Windows' Console command functions. That means that we can have av_log use the standard colour commands and let ffmpeg print colours in both mintty and cmd. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) riff: Add an additional AAC TwoCC riff: support 0xa100 TwoCC for G723_1 riff: add 0x594a TwoCC for Xan DPCM riff: add 0x64 to g726 riff: add G723_1 wav tag riff: map 0x0038 to amrnb riff: Support FLIC FourCC riff: add escape130 FourCC riff: support 'aas4' FourCC riff: add "YUV8" FourCC riff: Add "S263" FourCC riff: Support XMPG as mpeg1 riff: support BW10 as mpeg1 riff: Add SLDV FourCC for dvvideo riff: Support NTSC forward dvcpro videos riff: add dvis/pdvc FourCCs riff: add "GXVE" FourCC for WMV2 riff: add PLV1 fourcc to mpeg4 riff: Support decoding ASP variant from QNAP Systems riff: add "SM4V" FourCC ... Conflicts: libavformat/riff.c See: various commits, all the merged changes where in ffmpeg already Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Add an additional AAC TwoCCCarl Eugen Hoyos2014-04-04
| | | | | | | | Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx
| * riff: support 0xa100 TwoCC for G723_1Piotr Bandurski2014-04-04
| | | | | | | | Sample-Id: 4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav
| * riff: add 0x594a TwoCC for Xan DPCMPiotr Bandurski2014-04-04
| | | | | | | | Sample-Id: crusader-no-regret.avi
| * riff: add 0x64 to g726Compn2014-04-04
| | | | | | | | Sample-Id: g726-test1.wav
| * riff: add G723_1 wav tagPiotr Bandurski2014-04-04
| |
| * riff: map 0x0038 to amrnbCompn2014-04-04
| | | | | | | | Sample-Id: 40709.avi
| * riff: Support FLIC FourCCPaul B Mahol2014-04-04
| |
| * riff: add escape130 FourCCMichael Niedermayer2014-04-04
| |
| * riff: support 'aas4' FourCCPiotr Bandurski2014-04-04
| |
| * riff: add "YUV8" FourCCPiotr Bandurski2014-04-04
| | | | | | | | Sample-Id: MAILTEST.AVI
| * riff: Add "S263" FourCCPiotr Bandurski2014-04-04
| |
| * riff: Support XMPG as mpeg1Michael Niedermayer2014-04-04
| |
| * riff: support BW10 as mpeg1Michael Niedermayer2014-04-04
| |
| * riff: Add SLDV FourCC for dvvideoPiotr Bandurski2014-04-04
| |
| * riff: Support NTSC forward dvcpro videosCarl Eugen Hoyos2014-04-04
| | | | | | | | PAL looks incorrect.
| * riff: add dvis/pdvc FourCCsPiotr Bandurski2014-04-04
| |
| * riff: add "GXVE" FourCC for WMV2Piotr Bandurski2014-04-04
| | | | | | | | Sample-Id: vivd.avi
| * riff: add PLV1 fourcc to mpeg4Compn2014-04-04
| | | | | | | | Sample-Id: york-water-meteor.avi
| * riff: Support decoding ASP variant from QNAP SystemsCarl Eugen Hoyos2014-04-04
| |
| * riff: add "SM4V" FourCCPiotr Bandurski2014-04-04
| |
| * riff: add DYM4 mpeg4 fourccCompn2014-04-04
| |
| * riff: add DM4V FourCCPiotr Bandurski2014-04-04
| |
| * riff: add G264 to mpeg4, only decodes keyframesCompn2014-04-04
| |
| * riff: add "lsvm" FourCC for H263.Piotr Bandurski2014-04-04
| |
| * riff: Support H.264 fourcc UMSVCarl Eugen Hoyos2014-04-04
| |
| * riff: add FourCC for GeoVision camerasCarl Eugen Hoyos2014-04-04
| |
| * riff: Add V264 for H264 in CCTV recordingsCarl Eugen Hoyos2014-04-04
| |
| * riff: add H264 from QNAP SystemsCarl Eugen Hoyos2014-04-04
| |
| * riff: add SMV2 FourCC for H264Piotr Bandurski2014-04-04
| | | | | | | | Sample-Id: smv2.avi
| * riff: add ISMP/timecode tagClément Bœsch2014-04-04
| |
| * riff: Add ITRK tagJames Almer2014-04-04
| | | | | | | | | | Some players, like foobar2000 or modern versions of WMP, create WAV files using the ITRK tag for track instead of IPRT
* | Merge commit '121b5b7e0476d22408d748b914799b7c00acc3a4'Michael Niedermayer2014-04-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '121b5b7e0476d22408d748b914799b7c00acc3a4': isom: add some BOXX tags isom: add 'flic' tag isom: add 'm1v ' tag Conflicts: libavformat/isom.c See: ca8623e1a537fa48366efebdf235442f1197bb71 See: 8a3f976498cc096644b95ade7240a73e17d3a042 See: fca62f05005567514b5daaea230ba9365e202201 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * isom: add some BOXX tagsPiotr Bandurski2014-04-04
| |
| * isom: add 'flic' tagReimar Döffinger2014-04-04
| |
| * isom: add 'm1v ' tagCarl Eugen Hoyos2014-04-04
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'ad8f736b7404503d8f5164f4879175a2258dd64b'Michael Niedermayer2014-04-04
|\| | | | | | | | | | | | | | | | | * commit 'ad8f736b7404503d8f5164f4879175a2258dd64b': mxf: Remove typo also See: [FFmpeg-devel] [PATCH 3/3] lavf/mxfdec: delete trailing semi-colon Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Remove typoLuca Barbato2014-04-03
| | | | | | | | Reported-By: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '9464b69da6b373d1eeb6b3d269ad029d9647b498'Michael Niedermayer2014-04-04
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '9464b69da6b373d1eeb6b3d269ad029d9647b498': log: Unbreak windows support Conflicts: libavutil/log.c No change as we didnt use print_256color() in our implementation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * log: Unbreak windows supportLuca Barbato2014-04-03
| | | | | | | | Add the missing define.
* | configure: check and use -Wempty-bodyJames Darnley2014-04-04
| | | | | | | | | | | | | | Would have shown the trailing semi-colon in lavu/log.c that broke detection of 256 colour capable terminals. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: clear cur_pic structure instead of duplicating it in ↵Michael Niedermayer2014-04-03
| | | | | | | | | | | | | | | | | | ff_h264_update_thread_context() Fixes crash Found-by: iive Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/log: remove stray ;Michael Niedermayer2014-04-03
| | | | | | | | | | | | | | regression since 5a18b215f7138c0bd59f27389050b0311fa4a549 Reported-by: J_Darnley Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/log: fix negative log levelsMichael Niedermayer2014-04-03
| | | | | | | | | | | | These where broken by 7763118cae4eb468b032dbd29af15a011c2c233b Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/log: add code to test av_log()Michael Niedermayer2014-04-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-03
|\| | | | | | | | | | | | | | | | | | | * qatar/master: log: Do not assume the TERM variable is always set Conflicts: libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * log: Do not assume the TERM variable is always setLuca Barbato2014-04-03
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 13:01:06 +0000