summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/options_table: set err_detect to careful by defaultMichael Niedermayer2013-10-271-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/options_table: disable CRC checking by defaultAnton Khirnov2013-10-271-1/+1
| | | | | | | | | | | | | | | | 3 runs each of fate-suite/hevc-conformance/ENTP_C_LG_3.bit with crc flag 1841819858 decicycles in frame decode, 32 runs, 0 skips 1833937180 decicycles in frame decode, 32 runs, 0 skips 1843283884 decicycles in frame decode, 32 runs, 0 skips without crc flag 1703897301 decicycles in frame decode, 32 runs, 0 skips 1695031879 decicycles in frame decode, 32 runs, 0 skips 1697524383 decicycles in frame decode, 32 runs, 0 skips Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/takdec: also do crc check when er compliant is setMichael Niedermayer2013-10-271-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avio: Check for memory allocation failure of private dataDerek Buitenhuis2013-10-271-0/+7
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* avfiltergraph: Properly handle memory allocation failureDerek Buitenhuis2013-10-271-0/+13
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* timefilter: Handle memory allocation failureDerek Buitenhuis2013-10-274-0/+16
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* avcodec/avcodec.h: Add documentation for the AV_EF_* defifinesMichael Niedermayer2013-10-271-8/+8
| | | | | | The documentation is copied from the AVOption texts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* correct the AVOption documentation for AV_EF_CAREFULMichael Niedermayer2013-10-272-2/+2
| | | | | | | | The flag was and is intended to be a sane default and thus does not enable time consuming checks. This also matches how the flag is used in decoders and demuxers. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter: add mergeplanes filterPaul B Mahol2013-10-277-1/+377
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* ffmpeg_filter: Fix non jpeg yuv in jpeg supportMichael Niedermayer2013-10-271-0/+5
| | | | | | | This is a regression, did not bisect so dont know what caused it but likely some changes to the command line handling code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/utils: make "first_dts not matching first dts in the queue" message ↵Michael Niedermayer2013-10-271-1/+2
| | | | | | more informative Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/encoders: replace @xref with @ref commandStefano Sabatini2013-10-271-1/+2
| | | | @xref is ignored by texi2pod.
* vp9: skip itxfm_add if the whole block has no coefficients.Ronald S. Bultje2013-10-271-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/x86/videodsp: Small speedups in ff_emulated_edge_mc x86 SIMD.Ronald S. Bultje2013-10-271-17/+17
| | | | | | | | Don't use word-size multiplications if size == 2, and if we're using SIMD instructions (size >= 8), complete leftover 4byte sets using movd, not mov. Both of these changes lead to minor speedups. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/x86/videodsp: fix a bug in a %if statement where we used '%%' ↵Ronald S. Bultje2013-10-271-1/+1
| | | | | | instead of '&&'. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi/overlay: correct small error in intersection detectionBenedict Endemann2013-10-271-2/+2
| | | | | | | | | The image size of the destination image was used to determine if a source image was positioned outside the destination image, that no intersection could occur. Actually for these two cases the size of the source image has to be used! Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* vcodec/vc1dec: remove dead codeMichael Niedermayer2013-10-271-2/+1
| | | | | | Fixes CID732196 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/vc1_parser: check ff_vc1_parse_frame_header*() return valueMichael Niedermayer2013-10-271-2/+6
| | | | | | Fixed CID739860 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/tiff: factorize offset init codeMichael Niedermayer2013-10-271-3/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/tiff: remove TIFF_LONG special caseMichael Niedermayer2013-10-271-4/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/tiff: Fix use of uninitialized off variableMichael Niedermayer2013-10-271-3/+1
| | | | | | Fixes CID1108608 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/encoders: add libshine docTimothy Gu2013-10-271-0/+39
| | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* doc/protocols/rtp: apply misc fixesStefano Sabatini2013-10-271-6/+9
| | | | Partially suggested-by Burek Pekaric <burek021@gmail.com>.
* MAINTAINERS: add my name for LaunchpadTimothy Gu2013-10-271-0/+1
| | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/hevcpred_template: Fix integer overflowsMichael Niedermayer2013-10-271-2/+2
| | | | | | | | | | | | | | | | | signed integer overflow is undefined in C Fixes the following gcc warnings: In file included from libavcodec/hevcpred.c:27:0: libavcodec/hevcpred_template.c: In function ‘intra_pred_8’: libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow] In file included from libavcodec/hevcpred.c:31:0: libavcodec/hevcpred_template.c: In function ‘intra_pred_9’: libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow] In file included from libavcodec/hevcpred.c:35:0: libavcodec/hevcpred_template.c: In function ‘intra_pred_10’: libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow] Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'afa93d198aaf2cc661c4df6d4095cd030265d30a'Michael Niedermayer2013-10-273-17/+242
|\ | | | | | | | | | | | | | | * commit 'afa93d198aaf2cc661c4df6d4095cd030265d30a': hevc_parser: Set pict_type, key_frame and output_picture_number. hevc: Search start code in decode_nal_units(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc_parser: Set pict_type, key_frame and output_picture_number.Yusuke Nakamura2013-10-273-9/+233
| | | | | | | | | | Conflicts: libavcodec/hevc.c
| * hevc: Search start code in decode_nal_units().Yusuke Nakamura2013-10-271-8/+9
| | | | | | | | | | User may cut off a weird position and send a packet from there. This avoids returning as invalid data immediately.
* | Changelog: add entry for HEVC support.Anton Khirnov2013-10-271-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | FATE: update HEVC testsGuillaume Martres2013-10-2790-59/+5251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the tests that used the internal hevc checksum to use framecrc Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Conflicts: tests/fate/hevc.mak tests/ref/fate/hevc-conformance-DBLK_A_SONY_3 tests/ref/fate/hevc-conformance-DBLK_B_SONY_3 tests/ref/fate/hevc-conformance-DBLK_C_SONY_3 tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3 tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3 tests/ref/fate/hevc-conformance-POC_A_Bossen_3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/flacdec: also do crc check when er compliant is setMichael Niedermayer2013-10-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/error_resilience check error_concealment, not err_recognition.Anton Khirnov2013-10-271-3/+3
| | | | | | | | | | | | | | err_recognition is supposed to trigger detecting and reporting errors, not trying to fix them. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: add -colors optionStefano Sabatini2013-10-274-0/+22
| |
* | lavu/parseutils: add av_get_known_color_name()Stefano Sabatini2013-10-274-3/+32
| |
* | avformat/utils: do not override pts in h264 when they are provided from the ↵Michael Niedermayer2013-10-271-2/+4
| | | | | | | | | | | | | | | | demuxer Fixes Ticket2143 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/utils: check that size_t is unsignedMichael Niedermayer2013-10-261-0/+2
| | | | | | | | | | | | | | | | ANSI/ISO C guarantee this, yet there is evidence that there exist platforms where its not so. See: http://www.cs.utah.edu/dept/old/texinfo/glibc-manual-0.02/library_30.html Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-261-0/+1
|\ \ | | | | | | | | | | | | | | | | | | * qatar/master: fft-test: add a missing #include Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | fft-test: add a missing #includeAnton Khirnov2013-10-261-0/+1
| | | | | | | | | | | | stdio.h needed for printf since 7177df90a043bd59e172843fc7cb9e767080ea12
* | | Merge commit 'b284e1ffe343d6697fb950d1ee517bafda8a9844'Michael Niedermayer2013-10-261-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | * commit 'b284e1ffe343d6697fb950d1ee517bafda8a9844': mem: do not check for negative size Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mem: do not check for negative sizeVittorio Giovara2013-10-261-2/+2
| | | | | | | | | | | | | | | | | | size_t is guaranteed to be unsigned Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | | avformat/http: dont fail with unknown Content-EncodingsMichael Niedermayer2013-10-261-1/+0
| | | | | | | | | | | | | | | | | | | | | Fixes: http://m1.file.xiami.com/282/23282/343749/1769075752_709488_l.mp3 Based-on-patch-by: Crossle Song <sxm@yixia.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/h264_parser: heuristically detect non marked keyframesMichael Niedermayer2013-10-261-0/+3
| | | | | | | | | | | | | | | | | | Fixes Ticket3083 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/x86/cabac: include get_cabac_bypass_sign_x86() under #if ↵Michael Niedermayer2013-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | !BROKEN_COMPILER this might fix Ticket2999 as well as some fate clients untested as the original patch submitter no longer has the environment to test this should be reverted if it does not fix the issues Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | configure: link with built libs when pc-uninstalled is usedLukasz Marek2013-10-261-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2013-10-262-16/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: add support for libswresample options ffplay: use av_frame_get_pkt_pos instead directly accessing pkt pos ffplay: factor out picture freeing code ffplay: update and extend documentation for channel and stream switching Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | | ffplay: add support for libswresample optionsMarton Balint2013-10-261-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | | ffplay: use av_frame_get_pkt_pos instead directly accessing pkt posMarton Balint2013-10-261-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | | ffplay: factor out picture freeing codeMarton Balint2013-10-261-10/+11
| | | | | | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | | ffplay: update and extend documentation for channel and stream switchingMarton Balint2013-10-262-4/+7
| | | | | | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | | | avformat/md5enc: add format, version and column headersMichael Niedermayer2013-10-26237-1/+950
| | | | | | | | | | | | | | | | | | | | | | | | See Ticket2280 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud