summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-30
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avformat: Drop pointless "format" from container long names swscale: bury one more piece of inline asm under HAVE_INLINE_ASM. wv: K&R formatting cosmetics configure: Add missing descriptions to help output h264_ps: declare array of colorspace strings on its own line. fate: amix: specify f32 sample format for comparison tiny_psnr: support 32-bit float samples eamad/eatgq/eatqi: call special EA IDCT directly eamad: remove use of MpegEncContext mpegvideo: remove unnecessary inclusions of faandct.h af_asyncts: avoid overflow in out_size with large delta values af_asyncts: add first_pts option Conflicts: configure libavcodec/eamad.c libavcodec/h264_ps.c libavformat/crcenc.c libavformat/ffmdec.c libavformat/ffmenc.c libavformat/framecrcenc.c libavformat/md5enc.c libavformat/nutdec.c libavformat/rawenc.c libavformat/yuv4mpeg.c tests/tiny_psnr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_ps: declare array of colorspace strings on its own line.Ronald S. Bultje2012-07-29
| |
| * eamad/eatgq/eatqi: call special EA IDCT directlyMans Rullgard2012-07-29
| | | | | | | | | | | | | | | | | | | | | | | | These decoders use a special non-MPEG2 IDCT. Call it directly instead of going through dsputil. There is never any reason to use a regular IDCT with these decoders or to use the EA IDCT with other codecs. This also fixes the bizarre situation of eamad and eatqi decoding incorrectly if eatgq is disabled. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * eamad: remove use of MpegEncContextMans Rullgard2012-07-29
| | | | | | | | | | | | | | | | There is no sense in pulling in this monster struct just for a handful of fields. The code does not call any functions expecting an MpegEncContext. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mpegvideo: remove unnecessary inclusions of faandct.hMans Rullgard2012-07-29
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | options: Fix warning about incompatible pointer typejamal2012-07-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacenc: new default cutoffMichael Niedermayer2012-07-29
| | | | | | | | | | | | | | Improves subjective quality Formula and testing by: kamedo2 <fujisakihir90@yahoo.co.jp> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libx264: list possible profiles.Nicolas George2012-07-29
| | | | | | | | | | | | | | The values are listed if setting them fails. Using "-profile help" or "-profile list" have that effect. Similar to 3aba391. Suggested by "rogerdpack" in trac ticket #1529.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (35 commits) h264_idct_10bit: port x86 assembly to cpuflags. x86inc: clip num_args to 7 on x86-32. x86inc: sync to latest version from x264. fft: rename "z" to "zc" to prevent name collision. wv: return meaningful error codes. wv: return AVERROR_EOF on EOF, not EIO. mp3dec: forward errors for av_get_packet(). mp3dec: remove a pointless local variable. mp3dec: remove commented out cruft. lavfi: bump minor to mark stabilizing the ABI. FATE: add tests for yadif. FATE: add a test for delogo video filter. FATE: add a test for amix audio filter. audiogen: allow specifying random seed as a commandline parameter. vc1dec: Override invalid macroblock quantizer vc1: avoid reading beyond the last line in vc1_draw_sprites() vc1dec: check that coded slice positions and interlacing match. vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value configure: Move parts that should not be user-selectable to CONFIG_EXTRA lavf: remove commented out cruft in avformat_find_stream_info() ... Conflicts: Makefile configure libavcodec/vc1dec.c libavcodec/x86/h264_deblock.asm libavcodec/x86/h264_deblock_10bit.asm libavcodec/x86/h264dsp_mmx.c libavfilter/version.h libavformat/mp3dec.c libavformat/utils.c libavformat/wv.c libavutil/x86/x86inc.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_idct_10bit: port x86 assembly to cpuflags.Ronald S. Bultje2012-07-28
| |
| * fft: rename "z" to "zc" to prevent name collision.Ronald S. Bultje2012-07-28
| | | | | | | | | | | | Without this, cglobal will expand "z" to "zh" to access the high byte in a register's word, which causes a name collision with the ZH(x) macro further up in this file.
| * vc1dec: Override invalid macroblock quantizerMichael Niedermayer2012-07-28
| | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * vc1: avoid reading beyond the last line in vc1_draw_sprites()Michael Niedermayer2012-07-28
| | | | | | | | | | | | | | | | Fixes overread Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * vc1dec: check that coded slice positions and interlacing match.Michael Niedermayer2012-07-28
| | | | | | | | | | | | | | | | This fixes out of array writes Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return valueMichael Niedermayer2012-07-28
| | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * vp3: don't compile mmx IDCT functions on x86-64.Ronald S. Bultje2012-07-27
| | | | | | | | | | 64-bit CPUs always have SSE2, and a SSE2 version exists, thus the MMX version will never be used.
| * h264_loopfilter: port x86 simd to cpuflags.Ronald S. Bultje2012-07-27
| |
| * h264_chromamc_10bit: port x86 simd to cpuflags.Ronald S. Bultje2012-07-27
| |
| * vp3: port x86 SIMD to cpuflags.Ronald S. Bultje2012-07-27
| |
| * rv34: port x86 SIMD to cpuflags.Ronald S. Bultje2012-07-27
| |
| * vp56: only compile MMX SIMD on x86-32.Ronald S. Bultje2012-07-27
| | | | | | | | | | All x86-64 CPUs have SSE2, so the MMX version will never be used. This leads to smaller binaries.
| * vp56: port x86 simd to cpuflags.Ronald S. Bultje2012-07-27
| |
* | 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>