summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | avformat/soxenc: return more meaningful error codePaul B Mahol2014-08-28
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/h264: Move h264_vdpau_class under ifdef to avoid unused variable warningMichael Niedermayer2014-08-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/flashsv2enc: fix "unused variable" warningsMichael Niedermayer2014-08-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libvpxenc: Adds support for constant quality mode in VP9.Deb Mukherjee2014-08-28
| | | | | | | | | | | | | | | | | | | | | | Changes in the parameter mapping for libvpx to support the constant quality mode in VP9. The assumption in the patch is that if crf is provided but bitrate is 0, then the 'constant quality' mode of VP9 is used. However if both are present, the 'constrained quality' mode is used as before. Reviewed-by: James Zern <jzern@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/icoenc: Remove deprecated use of codec_nameMichael Niedermayer2014-08-28
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/ffprobe: fix -show_entries exampleStefano Sabatini2014-08-28
| |
* | Adds support for setting aq_mode in libvpx encoderDeb Mukherjee2014-08-27
| | | | | | | | | | Reviewed-by: James Zern <jzern@google.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | Replace incorrect use of "multiply" with "multiple"James Darnley2014-08-27
| | | | | | | | Also replace the plural form "multiplies" with "multiples".
* | avformat/rtpdec_asf: fix compiler warning about const qualifier being discardedMichael Niedermayer2014-08-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rdt: fix compiler warning about const qualifier being discardedMichael Niedermayer2014-08-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aviobuf: remove uses of deprecated url_feof()Michael Niedermayer2014-08-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc'Michael Niedermayer2014-08-27
|\| | | | | | | | | | | | | | | | | | | * commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc': x86: xvid: K&R formatting cosmetics Conflicts: libavcodec/x86/xvididct_sse2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: xvid: K&R formatting cosmeticsDiego Biurrun2014-08-27
| |
* | Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'Michael Niedermayer2014-08-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5': cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs Conflicts: libavcodec/mpeg4videodec.c libavcodec/x86/Makefile libavcodec/x86/dct-test.c libavcodec/x86/xvididct_sse2.c libavcodec/xvididct.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTsDiego Biurrun2014-08-27
| |
* | Merge commit '1f156af4274dc72d588620f6bedb4e9e66023c92'Michael Niedermayer2014-08-27
|\| | | | | | | | | | | | | * commit '1f156af4274dc72d588620f6bedb4e9e66023c92': x86: xvid_idct: Drop unused definitions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: xvid_idct: Drop unused definitionsDiego Biurrun2014-08-27
| |
* | Merge commit '404731bd20e1df5880e6fe381e975ba48afc75b2'Michael Niedermayer2014-08-27
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '404731bd20e1df5880e6fe381e975ba48afc75b2': pulse: Set the wallclock option as default Conflicts: libavdevice/pulse_audio_dec.c No change, the option was already default in FFmpeg since a long time Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pulse: Set the wallclock option as defaultLuca Barbato2014-08-27
| |
* | Merge commit 'ff771f79b55a346b4163d814b58ee4c98114745e'Michael Niedermayer2014-08-27
|\| | | | | | | | | | | | | * commit 'ff771f79b55a346b4163d814b58ee4c98114745e': vc1: Initialize start_code_found to 0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: Initialize start_code_found to 0Luca Barbato2014-08-27
| | | | | | | | Leftover of a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e.
* | lavc/libwebpenc: use WebPMemoryWriterClear()James Almer2014-08-27
| | | | | | | | | | | | | | WebPMemoryWriterClear() must be used instead of free() when libwebp ABI version is > 0x0203 Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | swr: aarch64 audio_convert and neon clobber testMichael Niedermayer2014-08-27
| | | | | | | | | | | | | | Ported from avresample Code by: Mans Rullgard, Janne Grunau, Martin Storsjo Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bktr: Fix Fabrice's nameTimothy Gu2014-08-27
| | | | | | | | | | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> This file with the incorrect name was added after the name was fixed in all other files. This is thus fixing a mistake Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mp3enc: don't abort if audio packets can't be bufferedJames Almer2014-08-27
| | | | | | | | | | | | | | Instead skip the picture streams and flush the queued audio packets. Should address ticket #3851. Signed-off-by: James Almer <jamrial@gmail.com>
* | Improved AC3 decoder level support (heavy drc, dialnorm)Jean-Francois Thibert2014-08-27
| | | | | | | | | | | | | | | | | | Added support for AC3 heavy dynamic range compression used to restrict the output range and added a setting to specify the output target level and use the dialog normalization field to apply it in the digital domain. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: reduce diff to libav in opt_target() by 16 linesMichael Niedermayer2014-08-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5'Michael Niedermayer2014-08-27
|\| | | | | | | | | | | | | * commit 'f5245a9c6206878b892adf3ccbccc9311c202af5': avconv: fix parsing the AVOptions for -target Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: fix parsing the AVOptions for -targetAnton Khirnov2014-08-27
| | | | | | | | CC: libav-stable@libav.org
* | Merge commit '1688eef25385089026aba55da1885f70a57815ab'Michael Niedermayer2014-08-27
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '1688eef25385089026aba55da1885f70a57815ab': avconv: fix the muxrate values for -target Conflicts: ffmpeg_opt.c No change, as ffmpegs muxrate is in bits/sec Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: fix the muxrate values for -targetAnton Khirnov2014-08-27
| | | | | | | | | | | | The mpegenc private option values are in 50-byte units. CC: libav-stable@libav.org
* | Merge commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de'Michael Niedermayer2014-08-27
|\| | | | | | | | | | | | | | | | | | | | | * commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de': mpegenc: limit the maximum muxrate Conflicts: libavformat/mpegenc.c See: 28d35dbe9f570025c220c08997bc11e21b3c1a66 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegenc: limit the maximum muxrateAnton Khirnov2014-08-27
| | | | | | | | | | | | It is written to the file as a 22-bit value. CC: libav-stable@libav.org
* | avformat/mxfenc: dont warn about d10_channelcount being ignored if its not setMichael Niedermayer2014-08-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0'Michael Niedermayer2014-08-26
|\| | | | | | | | | | | | | | | | | | | * commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0': h264: fully check cropping amount from sps Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: fully check cropping amount from spsVittorio Giovara2014-08-26
| | | | | | | | | | Even if sps.crop is true, the cropping amount may be zero. Fixes a sample with a valid but broken container cropping.
* | Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464'Michael Niedermayer2014-08-26
|\| | | | | | | | | | | | | | | | | | | | | * commit '0a024268261d05ccdcf7e03c85fb78d22037a464': libxvid: K&R formatting cosmetics Conflicts: libavcodec/libxvid.c libavcodec/libxvid_rc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libxvid: K&R formatting cosmeticsGabriel Dume2014-08-26
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d'Michael Niedermayer2014-08-26
|\| | | | | | | | | | | | | | | | | | | * commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d': doc: fix a typo Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: fix a typoGabriel Dume2014-08-26
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44'Michael Niedermayer2014-08-26
|\| | | | | | | | | | | | | * commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44': os_support: Adjust an outdated #endif comment Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * os_support: Adjust an outdated #endif commentDiego Biurrun2014-08-26
| |
* | avformat/rtpdec_h261: Fix sanity checksThomasVolkert2014-08-26
| | | | | | | | | | | | Fixes mbap and quant Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libx264: fix -b_qfactor and -chromaoffsetHii2014-08-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: remove assert that tests the same condition as the if() ↵Michael Niedermayer2014-08-26
| | | | | | | | | | | | directly above Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nsvdec: fix out-commented asserts so the function names existMichael Niedermayer2014-08-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/snowenc: remove out-commented assertMichael Niedermayer2014-08-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9'Michael Niedermayer2014-08-26
|\| | | | | | | | | | | | | * commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9': mpeg: Write H264 streams at offset 2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg: Write H264 streams at offset 2Luca Barbato2014-08-26
| | | | | | | | It hints that the content is H264 according to HD-DVD.
* | Merge commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e'Michael Niedermayer2014-08-26
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e': vc1: Fix the skip condition Conflicts: libavcodec/vc1_parser.c See: ede411dd03950b91c6346f2a3ae0e7546555f42f Merged-by: Michael Niedermayer <michaelni@gmx.at>