summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* swscale/swscale_internal: remove obsolete warningMichael Niedermayer2014-04-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swscale/swscale_internal: make the offset strings update themselfs when the ↵Michael Niedermayer2014-04-08
| | | | | | MAX_FILTER_SIZE is changed Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swscale/x86/swscale_template: loose hardcoded dstw_offsetMichael Niedermayer2014-04-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vcodec/bitstream: use av_malloc_array()Michael Niedermayer2014-04-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/avpacket: use av_malloc_array()Michael Niedermayer2014-04-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/a64multienc: use av_malloc(z)_array()Michael Niedermayer2014-04-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* cmdutils: use av_mallocz_array()Michael Niedermayer2014-04-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/ac3enc_float: use av_malloc_array()Michael Niedermayer2014-04-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* examples/transcoding: use av_malloc_array()Michael Niedermayer2014-04-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-04-08
|\ | | | | | | | | | | | | * cehoyos/master: Fix compilation with --disable-everything --enable-decoder=rawvideo. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix compilation with --disable-everything --enable-decoder=rawvideo.Carl Eugen Hoyos2014-04-08
| |
* | avfilter/vf_colormatrix: fix memleak on errorMichael Niedermayer2014-04-08
| | | | | | | | | | Fixes CID1197065 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample/resample: use av_malloc_array() where appropriateMichael Niedermayer2014-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample/dither: use av_malloc_array()Michael Niedermayer2014-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample/resample: Limit filter lengthMichael Niedermayer2014-04-08
|/ | | | | | | | | Related to CID1197063 The limit choosen is arbitrary and much larger than what makes sense. It avoids the need for checking arithmetic operations with the length for overflow Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-07
|\ | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libxvid: fix missing end of line character Conflicts: libavcodec/libxvid.c No change as the buggy modification wasnt merged, ffmpeg handles the case where both lumi and variance masking are set, differently Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libxvid: fix missing end of line characterVittorio Giovara2014-04-07
| | | | | | | | Error introduced in 5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1.
* | Fix standalone compilation of vp7 and vp8 decoder.Carl Eugen Hoyos2014-04-07
| | | | | | | | Fixes ticket #3536.
* | Read aspect ratio from tiff image files.Carl Eugen Hoyos2014-04-07
| |
* | avformat/oggdec: reset nstreams in closeSchenk, Michael2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: reset drefs_count in closeSchenk, Michael2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Remove leal op to fix icl inline asm.Matt Oliver2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: don't hardcode RTSP status codesReynaldo H. Verdejo Pinochet2014-04-07
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
* | rtspcodes: add full list of RTSP status codesReynaldo H. Verdejo Pinochet2014-04-07
| | | | | | | | | | | | | | Also add reason phrases from http://www.ietf.org/rfc/rfc2326.txt and macro to translate. Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
* | ffserver: nits & typosReynaldo H. Verdejo Pinochet2014-04-07
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
* | configure: Check for generated output in check_header_oc.Thilo Borgmann2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264/find_start_code: factorize addition outMichael Niedermayer2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | | | * qatar/master: xtea: Add Doxy @file and group See: 50f52a5498ff02c997d16b8181f32b933ce94b6b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xtea: Add Doxy @file and groupTimothy Gu2014-04-07
| |
* | Merge commit 'f73495686d109ffffaa8c0387e790e7997326229'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | | | * commit 'f73495686d109ffffaa8c0387e790e7997326229': adler32: Fix doxy group definition See: 624672fcce84c41e9e2fe9ff3ec3fd56140b175f and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adler32: Fix doxy group definitionTimothy Gu2014-04-07
| | | | | | | | | | | | Based on a patch by James Almer <jamrial@gmail.com>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | | | | | | | * commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a': h264: Refactor decode_nal_units Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Refactor decode_nal_unitsLuca Barbato2014-04-06
| |
* | Merge commit 'c389a804943095ebf078daec6b64690d2c97069c'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'c389a804943095ebf078daec6b64690d2c97069c': libxvid: Add SSIM displaying through a libxvidcore plugin Conflicts: libavcodec/libxvid.c libavcodec/version.h See: 3b3c1ed0768af874c624cc555fbbd1fcea370200 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libxvid: Add SSIM displaying through a libxvidcore pluginTimothy Gu2014-04-06
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1': libxvid: add working lumimasking and variance AQ Conflicts: libavcodec/libxvid.c libavcodec/version.h See: ccb212b6c3ed18c9ff4e0c982574c43f92657f9f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libxvid: add working lumimasking and variance AQTimothy Gu2014-04-06
| | | | | | | | | | | | | | The old implementation is unusable due to changes in the Xvid API. Further fixes by Michael Niedermayer <michaelni@gmx.at>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'd3789eeeed3423bd1ca9dc40030a2f7a21ea5332'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | * commit 'd3789eeeed3423bd1ca9dc40030a2f7a21ea5332': aarch64: implement videodsp.prefetch Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: implement videodsp.prefetchJanne Grunau2014-04-06
| | | | | | | | 8% faster h264 decoding on Apple A7.
* | Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | * commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14': aarch64: add armv8 CPU flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: add armv8 CPU flagJanne Grunau2014-04-06
| |
* | lavc/cpia: use avpriv_report_missing_feature()Stephan Hilb2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/cpia: fix typo in log messageStephan Hilb2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-04-06
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Set Matroska private data when muxing Prores. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Set Matroska private data when muxing Prores.Carl Eugen Hoyos2014-04-06
| | | | | | | | | | | | The specification requires the mov code point to be written as "fourcc".
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-06
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: add tests for SANM and VIMA Conflicts: tests/fate/video.mak tests/ref/fate/sanm See: 4cdff582068b968f9c2f14ce4bd5a68be069ce11 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | fate: add tests for SANM and VIMAPaul B Mahol2014-04-06
| | | | | | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | | Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123'Michael Niedermayer2014-04-06
|\| | | |/ |/| | | | | | | | | | | | | | | | | | | | | | | * commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123': LucasArts SMUSH demuxer Conflicts: Changelog doc/general.texi libavformat/smush.c libavformat/version.h See: bef8fd7099edfac9c487e6eb75d7e6116ad80465 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * LucasArts SMUSH demuxerPaul B Mahol2014-04-06
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '6f273093e54cba130f3ffde3d6433e74baa4ad89'Michael Niedermayer2014-04-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6f273093e54cba130f3ffde3d6433e74baa4ad89': LucasArts SMUSH VIMA audio decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h libavcodec/vima.c This commit adds a AV_CODEC_ID_ADPCM_VIMA alias in addition to the previously used AV_CODEC_ID_VIMA, as well as a AVCodec with name "adpcm_vima" in addition to the previously used name "vima" These changes are needed for compatibility with the renamed codec in libav See: b18357326ca1522d7fb7f4276ddebfccc29ce72c and others Merged-by: Michael Niedermayer <michaelni@gmx.at>