aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/libxavs: Use av_mallocz_array()Michael Niedermayer2014-04-221-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/cngenc: Use av_malloc_array()Michael Niedermayer2014-04-221-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/snow: use FF_ALLOC(Z)_ARRAY_OR_GOTOMichael Niedermayer2014-04-221-6/+6
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/internal: add FF_ALLOC_ARRAY_OR_GOTO & FF_ALLOCZ_ARRAY_OR_GOTOMichael Niedermayer2014-04-221-0/+18
| | | | | | These are similar to the existing FF_ALLOCZ_OR_GOTO & FF_ALLOC_OR_GOTO Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8'Michael Niedermayer2014-04-210-0/+0
|\ | | | | | | | | | | | | | | * commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8': mpegvideo: Use the current_picture pts See: c354576457c8ae0906d6f4f20c80816f3e3bb55d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Use the current_picture ptsMichael Niedermayer2014-04-211-2/+2
| | | | | | | | | | | | | | | | | | The picture slot can be recycled by select_input_picture and only current_picture is populated with the valid pts. Unbreak timestamps when in cbr mode. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '6f243b17c537646b894857d43dfdac65f85ab377'Michael Niedermayer2014-04-210-0/+0
|\| | | | | | | | | | | | | | | * commit '6f243b17c537646b894857d43dfdac65f85ab377': avcodec/fic: Fix return value check See: 230db1426d127a25c03b457fec25900653de2721 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec/fic: Fix return value checkMichael Niedermayer2014-04-211-2/+2
| | | | | | | | | | | | | | | | Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9'Michael Niedermayer2014-04-210-0/+0
|\| | | | | | | | | | | | | | | * commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9': avcodec/fic: clear slice_data See: 1db8bc56488c888d57f5339812bd6f4117d85c3e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec/fic: clear slice_dataMichael Niedermayer2014-04-211-0/+1
| | | | | | | | | | | | | | | | Fixes artifacts Fixes use of freed memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575'Michael Niedermayer2014-04-210-0/+0
|\| | | | | | | | | | | | | | | * commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575': avcodec/fic: fix slice checks See: d46ef40129487143f2fa4e0b44b3f5e788c4fcb2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec/fic: fix slice checksMichael Niedermayer2014-04-211-5/+5
| | | | | | | | | | | | | | fix integer overflows Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '93e15a323871613fd26f1f1e317029a50b5b24ca'Michael Niedermayer2014-04-212-12/+53
|\| | | | | | | | | | | | | * commit '93e15a323871613fd26f1f1e317029a50b5b24ca': fic: use correct IDCT Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fic: use correct IDCTKostya Shishkov2014-04-212-12/+53
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avfilter/filtfmts: Support dynamically allocated in/outputsMichael Niedermayer2014-04-211-5/+5
| | | | | | | | | | | | | | Fixes crash Fixes Ticket3468 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Fix decoder search in find stream infoMichael Niedermayer2014-04-212-3/+11
| | | | | | | | | | | | Fixes Ticket3548 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfenc: dont allow non interleaved packetsMichael Niedermayer2014-04-211-0/+1
| | | | | | | | | | | | The muxer does not support this currently Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/pmpdec: remove cur_dts timestamp hackMichael Niedermayer2014-04-211-4/+0
| | | | | | | | | | | | | | | | It appears the demuxer works fine without it Fixes Ticket3534 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/x86/vp9lpf: add a comment above a bunch of SWAP.Clément Bœsch2014-04-201-0/+2
| |
* | avcodec/x86/vp9lpf: merge a few movs with other instructions.Clément Bœsch2014-04-201-42/+37
| |
* | lavf/pcm: remove redundant checkLukasz Marek2014-04-201-2/+0
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/arm/vc1dsp_init_neon: fix code so it compiles and passes fate-vc1Michael Niedermayer2014-04-201-3/+3
| | | | | | | | | | | | The original patch seems to be missing a 16x16 function though Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dsp: introduce cases for 8x8 and 16x16Christophe Gisquet2014-04-206-135/+259
| | | | | | | | | | | | | | | | | | | | | | | | This allows further unrolling the DSP implementation where possible. x86 and ARM DSP modified by simply moving the multiple calls from vc1dec to the DSP code. Decoding improvements should only occurs because of the compiler actually able to unroll more. Decoding time: ~8.80s -> 8.64s (ie around 2%) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcdoec/webp: use av_malloc_array()Michael Niedermayer2014-04-201-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: use av_malloc(z)_array()Michael Niedermayer2014-04-201-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ratecontrol: use av_malloc_array()Michael Niedermayer2014-04-201-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/huffman: use av_malloc_array()Michael Niedermayer2014-04-201-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/exif: do not follow 0 offsetsMichael Niedermayer2014-04-201-0/+5
| | | | | | | | | | | | | | Fixes exif decoding failure of 1295328_300.jpg Reviewed-by; Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/exif/exif_add_metadata: add support for SSHORT & SBYTEMichael Niedermayer2014-04-204-9/+13
| | | | | | | | | | | | | | | | No working testcase, this omission was just spoted when the parser apparently went out of sync. Reviewed-by; Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'lukaszmluki/master'Michael Niedermayer2014-04-202-12/+107
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * lukaszmluki/master: lavd/xv: implement repaint message lavd/xv: add window id param lavd/xv: keep aspect ratio Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavd/xv: implement repaint messageLukasz Marek2014-04-191-10/+27
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
| * | lavd/xv: add window id paramLukasz Marek2014-04-192-2/+14
| | | | | | | | | | | | | | | | | | | | | Device is able to use existing window, that can be a part of existing GUI - instead of newly created one. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
| * | lavd/xv: keep aspect ratioLukasz Marek2014-04-191-2/+68
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | | avformat/iff: extend IFF demuxer to decode DSDIFF 64-bit chunksPeter Ross2014-04-201-8/+271
| | | | | | | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge commit '911fa05b514e1be009e00b79d7004b93717c023b'Michael Niedermayer2014-04-192-3/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * commit '911fa05b514e1be009e00b79d7004b93717c023b': mvc: Specify the pixel format for the mv-mvc* tests Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mvc: Specify the pixel format for the mv-mvc* testsMartin Storsjö2014-04-192-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also set the RGBA pixel format correctly as the native endian format, which is what it returns. This fixes the tests on big endian. Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '6dfd99c93808d6504dd5cb1fad847d68cb179352'Michael Niedermayer2014-04-194-0/+98
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6dfd99c93808d6504dd5cb1fad847d68cb179352': fate: add tests for SGI RLE and MVC1&2 decoders Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | fate: add tests for SGI RLE and MVC1&2 decodersVittorio Giovara2014-04-194-0/+98
| | |
* | | Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'Michael Niedermayer2014-04-193-60/+87
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '55ddd700c67529ff2c6c4e976673f1341bba7a82': Silicon Graphics Movie demuxer Conflicts: Changelog libavformat/mvdec.c libavformat/version.h See: 6fb40779cd3457a819e20d6db91a142c47cad3c2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Silicon Graphics Movie demuxerPeter Ross2014-04-196-1/+473
| | | | | | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | | Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'Michael Niedermayer2014-04-194-68/+78
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '86a0432688216562926d4aee36118f01be6d5e1b': Silicon Graphics Motion Video Compressor 1 & 2 decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/mvcdec.c libavcodec/version.h See: 746b1dcc98b466e4abd301f304127583722ad80b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Silicon Graphics Motion Video Compressor 1 & 2 decoderPeter Ross2014-04-198-1/+317
| | | | | | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | | Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'Michael Niedermayer2014-04-197-38/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee': Silicon Graphics RLE 8-bit video decoder Conflicts: Changelog doc/general.texi libavcodec/avcodec.h libavcodec/sgirledec.c libavcodec/version.h See: afa1617b937f3675f74c6351a46c45f8c24d67f2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Silicon Graphics RLE 8-bit video decoderPeter Ross2014-04-199-1/+174
| | | | | | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | | Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2'Michael Niedermayer2014-04-191-4/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '34c5a6660a9e5e3cf301691bb29d011638953dc2': h264: codec reinit: remove statements without effect Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | h264: codec reinit: remove statements without effectJanne Grunau2014-04-191-4/+1
| | | | | | | | | | | | | | | | | | | | | avctx->coded_{height,width} will always equal h->{height,width} since init_dimensions() does that explicitly, Size changes are detected by changes in mb_{height,width} earlier and propagated through the needs_reinit variable.
* | | Merge commit '6ef96292d99302a59f824713fc763f6abd3754df'Michael Niedermayer2014-04-191-0/+1
|\| | | | | | | | | | | | | | | | | | | | * commit '6ef96292d99302a59f824713fc763f6abd3754df': utils: add yvyu422 to avcodec_align_dimensions2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | utils: add yvyu422 to avcodec_align_dimensions2Vittorio Giovara2014-04-191-0/+1
| | |
* | | Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'Michael Niedermayer2014-04-191-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd23fc8846d255e31896453136b4c77bc6d5e873f': filtfmts: remove unused lavf include A include for channel_layout.h, is added otherwise compile would break Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | filtfmts: remove unused lavf includeVittorio Giovara2014-04-191-1/+0
| | |