summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* mpegaudiodec: switch to av_assertMichael Niedermayer2012-07-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dxva2: Fix some warnings about incompatible pointer typejamal2012-07-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dvdsubenc: switch to av_assertMichael Niedermayer2012-07-28
| | | | | | | we use av_assert0() because the previous code unconditionally enabled the assert. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proresdsp: port x86 assembly to cpuflags. lavr: x86: improve non-SSE4 version of S16_TO_S32_SX macro lavfi: better channel layout negotiation alac: check for truncated packets alac: reverse lpc coeff order, simplify filter lavr: add x86-optimized mixing functions x86: add support for fmaddps fma4 instruction with abstraction to avx/sse tscc2: fix typo in array index build: use COMPILE template for HOSTOBJS build: do full flag handling for all compiler-type tools eval: fix printing of NaN in eval fate test. build: Rename aandct component to more descriptive aandcttables mpegaudio: bury inline asm under HAVE_INLINE_ASM. x86inc: automatically insert vzeroupper for YMM functions. rtmp: Check the buffer length of ping packets rtmp: Allow having more unknown data at the end of a chunk size packet without failing rtmp: Prevent reading outside of an allocate buffer when receiving server bandwidth packets Conflicts: Makefile configure libavcodec/x86/proresdsp.asm libavutil/eval.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * proresdsp: port x86 assembly to cpuflags.Ronald S. Bultje2012-07-27
| |
| * alac: check for truncated packetsJustin Ruggles2012-07-27
| | | | | | | | | | This will give a clearer error message when the error is caused by a truncated packet.
| * alac: reverse lpc coeff order, simplify filterJustin Ruggles2012-07-27
| | | | | | | | Reversing the lpc coefficient order simplifies indexing in the filter.
| * tscc2: fix typo in array indexKostya Shishkov2012-07-27
| |
| * build: Rename aandct component to more descriptive aandcttablesDiego Biurrun2012-07-26
| |
| * mpegaudio: bury inline asm under HAVE_INLINE_ASM.Ronald S. Bultje2012-07-26
| |
| * x86inc: automatically insert vzeroupper for YMM functions.Ronald S. Bultje2012-07-26
| |
* | dwt: Fix several warnings about incompatible pointer typejamal2012-07-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil: support 50 and 60 frame rates in timecode apiMatthieu Bouron2012-07-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | zmbv: Fix warning about discarded qualifierMichael Niedermayer2012-07-27
| | | | | | | | | | Based on patch by: jamal <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: Fix warnings about incompatible pointer type and discarded qualifiersjamal2012-07-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | SubViewer demuxer and decoder.Clément Bœsch2012-07-26
| |
* | lavc/rt: small wording fix in a comment.Clément Bœsch2012-07-26
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libopenjpeg: support YUV and deep RGB pixel formats Fix typo in v410 decoder. vf_yadif: unset cur_buf on the input link. vf_overlay: ensure the overlay frame does not get leaked. vf_overlay: prevent premature freeing of cur_buf Support urlencoded http authentication credentials rtmp: Return an error when the client bandwidth is incorrect rtmp: Return proper error code in handle_server_bw rtmp: Return proper error code in handle_client_bw rtmp: Return proper error codes in handle_chunk_size lavr: x86: add missing vzeroupper in ff_mix_1_to_2_fltp_flt() vp8: Replace x*155/100 by x*101581>>16. vp3: don't use calls to inline asm in yasm code. x86/dsputil: put inline asm under HAVE_INLINE_ASM. dsputil_mmx: fix incorrect assembly code rtmp: Factorize the code by adding handle_invoke rtmp: Factorize the code by adding handle_chunk_size rtmp: Factorize the code by adding handle_ping rtmp: Factorize the code by adding handle_client_bw rtmp: Factorize the code by adding handle_server_bw Conflicts: libavcodec/libopenjpegdec.c libavcodec/x86/dsputil_mmx.c libavfilter/vf_overlay.c libavformat/Makefile libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libopenjpeg: support YUV and deep RGB pixel formatsMichael Bradshaw2012-07-26
| | | | | | | | | | | | | | Based on FFmpeg version from commit 3275981207e30e140cffaea334ac390f1a04266a Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * Fix typo in v410 decoder.Carl Eugen Hoyos2012-07-26
| | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * vp8: Replace x*155/100 by x*101581>>16.Ronald S. Bultje2012-07-25
| | | | | | | | | | | | Idea stolen from webp (by Pascal Massimino) - because it's Cool. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * vp3: don't use calls to inline asm in yasm code.Ronald S. Bultje2012-07-25
| | | | | | | | | | | | | | | | Mixing yasm and inline asm is a bad idea, since if either yasm or inline asm is not supported by your toolchain, all of the asm stops working. Thus, better to use either one or the other alone. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * x86/dsputil: put inline asm under HAVE_INLINE_ASM.Ronald S. Bultje2012-07-25
| | | | | | | | | | | | | | This allows compiling with compilers that don't support gcc-style inline assembly. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * dsputil_mmx: fix incorrect assembly codeYang Wang2012-07-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ff_put_pixels_clamped_mmx(), there are two assembly code blocks. In the first block (in the unrolled loop), the instructions "movq 8%3, %%mm1 \n\t", and so forth, have problems. From above instruction, it is clear what the programmer wants: a load from p + 8. But this assembly code doesn’t guarantee that. It only works if the compiler puts p in a register to produce an instruction like this: "movq 8(%edi), %mm1". During compiler optimization, it is possible that the compiler will be able to constant propagate into p. Suppose p = &x[10000]. Then operand 3 can become 10000(%edi), where %edi holds &x. And the instruction becomes "movq 810000(%edx)". That is, it will stride by 810000 instead of 8. This will cause a segmentation fault. This error was fixed in the second block of the assembly code, but not in the unrolled loop. How to reproduce: This error is exposed when we build using Intel C++ Compiler, with IPO+PGO optimization enabled. Crashed when decoding an MJPEG video. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | mpc8: Initialize AVFrame properlyMichael Niedermayer2012-07-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpc7: Initialize AVFrame properlyMichael Niedermayer2012-07-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264_cabac: switch to av_assertMichael Niedermayer2012-07-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264_cabac: switch to av_assertMichael Niedermayer2012-07-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Add a new option 'rtmp_pageurl' doc: Update the description of the rtmp_tcurl option rtmp: Make the description of the rtmp_tcurl option more generic libfdk-aacenc: add LATM/LOAS encapsulation support sctp: add port missing error message tcp: add port missing error message avfilter: Fix printf format string conversion specifier Conflicts: libavcodec/version.h libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libfdk-aacenc: add LATM/LOAS encapsulation supportKieran Kunhya2012-07-25
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | libvpxenc: switch to av_assertMichael Niedermayer2012-07-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | intrax8: asserts cleanupMichael Niedermayer2012-07-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix avui stream-copy.Carl Eugen Hoyos2012-07-25
| | | | | | | | | | | | The native decoder and MPlayer's binary decoder only need the APRG atom, QuickTime at least requires also the ARES atom and four additional 0 bytes padding at the end of stsd.
* | imgconvert: Implement avcodec_find_best_pix_fmt_of_list()Michael Niedermayer2012-07-25
| | | | | | | | | | | | | | | | | | | | | | | | The old avcodec_find_best_pix_fmt() was insufficient due to 64 pix_fmt limit. In ffmpeg this problem has been solved long ago through avcodec_find_best_pix_fmt2() Today libav has added a incompatible modified version of avcodec_find_best_pix_fmt2() under the same name, thus again breaking ABI/API ... The avcodec_find_best_pix_fmt_of_list() added in this commit here makes the libav API available to ffmpeg users too. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libopenjpegenc: set numresolution max to INT_MAXMichael Bradshaw2012-07-25
| | | | | | | | | | | | | | OpenJPEG doesn't have a max lowres limit, so don't enforce an arbitrary one. Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code rtmp: Move the CONFIG_ condition into the if conditions aac: Mention abbreviation as well in long_name build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled doc: Add Git configuration section configure: Add a dependency on https for rtmpts rtp: Only choose static payload types if the sample rate and channels are right Conflicts: doc/git-howto.texi libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: Mention abbreviation as well in long_nameDiego Biurrun2012-07-24
| | | | | | | | Most people know the codec as "AAC" and not "Advanced Audio Coding".
* | iffdec: Fix integer overflow.Michael Niedermayer2012-07-24
| | | | | | | | | | Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: dont apply the loop filter on fieldsMichael Niedermayer2012-07-24
| | | | | | | | | | | | Fixes read of uninitialized memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: dont attempt error concealment on field pictures.Michael Niedermayer2012-07-24
| | | | | | | | | | | | This is not implemented and doesnt work. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ec: print picture type with concealment error message.Michael Niedermayer2012-07-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dsputil_mmx: fix incorrect assembly codeyang2012-07-24
| | | | | | | | | | | | | | | | | | | | | | | | In file libavcodec/x86/dsputil_mmx.c, function ff_put_pixels_clamped_mmx(), there are two assembly code blocks. In the first block (in the unrolled loop), the instructions "movq 8%3, %%mm1 \n\t" etc have problem. For above instruction, it is clear what the programmer wants: a load from p + 8. But this assembly code doesn’t guarantee that. It only works if the compiler puts p in a register to produce an instruction like this: “movq 8(%edi), %mm1”. During compiler optimization, it is possible that the compiler will be able to constant propagate into p. Suppose p = &x[10000]. Then operand 3 can become 10000(%edi), where %edi holds &x. And the instruction becomes “movq 810000(%edx)”. That is, it will stride by 810000 instead of 8. This will cause the segmentation fault. This error was fixed in the second block of the assembly code, but not in the unrolled loop. How to reproduce: This error is exposed when we build the ffmpeg using Intel C++ Compiler, IPO+PGO optimization. The ffmpeg was crashed when decoding a mjpeg video. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cavsdec: switch to av_assertMichael Niedermayer2012-07-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/bitstream: switch to av_assertMichael Niedermayer2012-07-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix typo in v410 decoder.Carl Eugen Hoyos2012-07-23
| |
* | cosmetics: iff: fix typoPaul B Mahol2012-07-23
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | fate: enable fate-vc1_sa10143Michael Niedermayer2012-07-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: v410dec: Implement explode mode support zerocodec: fix direct rendering. wav: init st to NULL to avoid a false-positive warning. wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit h264: refactor NAL decode loop RTMPTE protocol support RTMPE protocol support rtmp: Add ff_rtmp_calc_digest_pos() rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global swscale: add missing HAVE_INLINE_ASM check. lavfi: place x86 inline assembly under HAVE_INLINE_ASM. vc1: Add a test for interlaced field pictures swscale: Mark all init functions as av_cold swscale: x86: Drop pointless _mmx suffix from filenames lavf: use conditional notation for default codec in muxer declarations. swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM. dsputil: ppc: cosmetics: pretty-print dsputil: x86: add SHUFFLE_MASK_W macro configure: respect CC_O setting in check_cc Conflicts: Changelog configure libavcodec/v410dec.c libavcodec/zerocodec.c libavformat/asfenc.c libavformat/version.h libswscale/utils.c libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * v410dec: Implement explode mode supportDerek Buitenhuis2012-07-23
| | | | | | | | | | | | | | Try and decode broken files, but still fail if explode mode is enabled. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * zerocodec: fix direct rendering.Reimar Döffinger2012-07-23
| | | | | | | | | | | | | | | | | | | | | | | | Set picture type before calling get_buffer. This allows the DR application to make better decisions. It also fixes a resource leak in case of missing reference frames since it would call get_buffer but never release_buffer. Also use FFSWAP to ensure that the AVFrame is properly initialized in the next get_buffer (in particular that data[0] is NULL). Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>