aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-04Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81'Michael Niedermayer
* commit '8542f9c4f17125d483c40c0c5723842f1c982f81': replaygain: correctly parse peak values Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04Merge commit '25b6837f7cacd691b19cbc12b9dad1ce84a318a1'Michael Niedermayer
* commit '25b6837f7cacd691b19cbc12b9dad1ce84a318a1': replaygain: fix gain sign decoding Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04x86/synth_filter: remove the main loop when it's not neededChristophe Gisquet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04lavu/opt: validate range before dereferenceLukasz Marek
This change make error handling simplier. av_opt_freep_ranges may be called when some ranges are NULL, for example after memory allocation fail. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04ffmpeg: frame droping due to fps should not be a warningMichael Niedermayer
This reverts part of 41e7e46cac507e993af6d656c8d3672ba3f9e304 See: http://thread.gmane.org/gmane.comp.video.ffmpeg.user/51229 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04avcodec.h, avpacket.c: use const AVPacket pointers in copy functionsRoman Fietze
Signed-off-by: Roman Fietze <roman.fietze@telemotive.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04replaygain: correctly parse peak valuesAlessandro Ghedini
According to the ReplayGain spec, the peak amplitude may overflow and may result in peak amplitude values greater than 1.0 with psychoacoustically coded audio, such as MP3. Fully compliant decoders must allow peak overflows. Additionally, having peak values in the 0<->UINT32_MAX scale makes it more difficult for applications to actually use the peak values (e.g. when implementing clipping prevention) since values have to be rescaled down. This patch corrects the peak parsing by removing the rescaling of the decoded values between 0 and UINT32_MAX and the 1.0 upper limit. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-04avformat/wtvdec: populate codec_tag from BITMAPINFOHEADERPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04avformat/wtvdec: ignore MPEG2VIDEO extradata when count is invalidPeter Ross
Fixes ticket #3522. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04replaygain: fix gain sign decodingAlessandro Ghedini
The gain sign was incorrectly decoded: since the FFSIGN() macro treats 0 as negative, gain values starting with "0." were always decoded as negative. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-04oggenc: check return value of av_mallocz()James Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: arm: asm decode_block_coeffs_internal is vp8 specific See: 89f2f5dbd7a23e7ec1073d3c08d46093a01a4135 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04Merge commit '287432430c5c9cb8ffe1da1376949de494f24e45'Michael Niedermayer
* commit '287432430c5c9cb8ffe1da1376949de494f24e45': fate: add a VP7 test Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'Michael Niedermayer
* 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>
2014-04-04arm: asm decode_block_coeffs_internal is vp8 specificJanne Grunau
Unbreaks compilation on arm due to conflicting types for 'ff_decode_block_coeffs_armv6'.
2014-04-04log: allow color highlighting in Cygwin's minttyJames Darnley
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>
2014-04-04fate: add a VP7 testVittorio Giovara
2014-04-04On2 VP7 decoderPeter Ross
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>
2014-04-04Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2014-04-04Merge commit '121b5b7e0476d22408d748b914799b7c00acc3a4'Michael Niedermayer
* 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>
2014-04-04Merge commit 'ad8f736b7404503d8f5164f4879175a2258dd64b'Michael Niedermayer
* 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>
2014-04-04Merge commit '9464b69da6b373d1eeb6b3d269ad029d9647b498'Michael Niedermayer
* 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>
2014-04-04configure: check and use -Wempty-bodyJames Darnley
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>
2014-04-04riff: Add an additional AAC TwoCCCarl Eugen Hoyos
Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx
2014-04-04riff: support 0xa100 TwoCC for G723_1Piotr Bandurski
Sample-Id: 4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav
2014-04-04riff: add 0x594a TwoCC for Xan DPCMPiotr Bandurski
Sample-Id: crusader-no-regret.avi
2014-04-04riff: add 0x64 to g726Compn
Sample-Id: g726-test1.wav
2014-04-04riff: add G723_1 wav tagPiotr Bandurski
2014-04-04riff: map 0x0038 to amrnbCompn
Sample-Id: 40709.avi
2014-04-04riff: Support FLIC FourCCPaul B Mahol
2014-04-04riff: add escape130 FourCCMichael Niedermayer
2014-04-04riff: support 'aas4' FourCCPiotr Bandurski
2014-04-04riff: add "YUV8" FourCCPiotr Bandurski
Sample-Id: MAILTEST.AVI
2014-04-04riff: Add "S263" FourCCPiotr Bandurski
2014-04-04riff: Support XMPG as mpeg1Michael Niedermayer
2014-04-04riff: support BW10 as mpeg1Michael Niedermayer
2014-04-04riff: Add SLDV FourCC for dvvideoPiotr Bandurski
2014-04-04riff: Support NTSC forward dvcpro videosCarl Eugen Hoyos
PAL looks incorrect.
2014-04-04riff: add dvis/pdvc FourCCsPiotr Bandurski
2014-04-04riff: add "GXVE" FourCC for WMV2Piotr Bandurski
Sample-Id: vivd.avi
2014-04-04riff: add PLV1 fourcc to mpeg4Compn
Sample-Id: york-water-meteor.avi
2014-04-04riff: Support decoding ASP variant from QNAP SystemsCarl Eugen Hoyos
2014-04-04riff: add "SM4V" FourCCPiotr Bandurski
2014-04-04riff: add DYM4 mpeg4 fourccCompn
2014-04-04riff: add DM4V FourCCPiotr Bandurski
2014-04-04riff: add G264 to mpeg4, only decodes keyframesCompn
2014-04-04riff: add "lsvm" FourCC for H263.Piotr Bandurski
2014-04-04riff: Support H.264 fourcc UMSVCarl Eugen Hoyos
2014-04-04riff: add FourCC for GeoVision camerasCarl Eugen Hoyos
2014-04-04riff: Add V264 for H264 in CCTV recordingsCarl Eugen Hoyos
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 04:01:36 +0000