mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-02-14 03:11:25 +00:00
24823a761c
* qatar/master: qdm2: remove broken and disabled dump_context() debug function x86: h264_intrapred: use newly introduced SPLAT* and PSHUFLW macros x86inc: add SPLATB_LOAD, SPLATB_REG, PSHUFLW macros x86inc: modify ALIGN to not generate long nops on i586 x86: h264_intrapred: port to cpuflag macros avplay: update input filter pointer when the filtergraph is reset. avconv: fix parsing of -force_key_frames option. h264: use templates to avoid excessive inlining xtea: Make the count parameter match the documentation blowfish: Make the count parameter match the documentation mpegvideo: Don't use ff_mspel_motion() for vc1 xtea: invert branch and loop precedence blowfish: invert branch and loop precedence flvdec: optionally trust the metadata avconv: Set audio filter time base to the sample rate vp8: Add ifdef guards around the sse2 loopfilter in the sse2slow branch too Conflicts: ffmpeg.c ffplay.c libavcodec/h264.c libavcodec/mpegvideo_common.h Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| ac3dsp.asm | ||
| ac3dsp_mmx.c | ||
| cabac.h | ||
| cavsdsp_mmx.c | ||
| dct32_sse.asm | ||
| deinterlace.asm | ||
| diracdsp_mmx.c | ||
| diracdsp_mmx.h | ||
| diracdsp_yasm.asm | ||
| dnxhd_mmx.c | ||
| dsputil_mmx.c | ||
| dsputil_mmx.h | ||
| dsputil_mmx_avg_template.c | ||
| dsputil_mmx_qns_template.c | ||
| dsputil_mmx_rnd_template.c | ||
| dsputil_yasm.asm | ||
| dsputilenc_mmx.c | ||
| dsputilenc_yasm.asm | ||
| dwt.c | ||
| dwt.h | ||
| dwt_yasm.asm | ||
| fdct_mmx.c | ||
| fft.c | ||
| fft.h | ||
| fft_3dn.c | ||
| fft_3dn2.c | ||
| fft_mmx.asm | ||
| fmtconvert.asm | ||
| fmtconvert_mmx.c | ||
| h264_chromamc.asm | ||
| h264_chromamc_10bit.asm | ||
| h264_deblock.asm | ||
| h264_deblock_10bit.asm | ||
| h264_i386.h | ||
| h264_idct.asm | ||
| h264_idct_10bit.asm | ||
| h264_intrapred.asm | ||
| h264_intrapred_10bit.asm | ||
| h264_intrapred_init.c | ||
| h264_qpel_10bit.asm | ||
| h264_qpel_mmx.c | ||
| h264_weight.asm | ||
| h264_weight_10bit.asm | ||
| h264dsp_mmx.c | ||
| idct_mmx.c | ||
| idct_mmx_xvid.c | ||
| idct_sse2_xvid.c | ||
| idct_xvid.h | ||
| imdct36_sse.asm | ||
| lpc_mmx.c | ||
| Makefile | ||
| mathops.h | ||
| mlpdsp.c | ||
| motion_est_mmx.c | ||
| mpegaudiodec_mmx.c | ||
| mpegvideo_mmx.c | ||
| mpegvideo_mmx_template.c | ||
| pngdsp-init.c | ||
| pngdsp.asm | ||
| proresdsp-init.c | ||
| proresdsp.asm | ||
| rv34dsp.asm | ||
| rv34dsp_init.c | ||
| rv40dsp.asm | ||
| rv40dsp_init.c | ||
| sbrdsp.asm | ||
| sbrdsp_init.c | ||
| simple_idct_mmx.c | ||
| snowdsp_mmx.c | ||
| v210-init.c | ||
| v210.asm | ||
| vc1dsp_mmx.c | ||
| vc1dsp_yasm.asm | ||
| vp3dsp.asm | ||
| vp8dsp-init.c | ||
| vp8dsp.asm | ||
| vp56_arith.h | ||
| vp56dsp.asm | ||
| vp56dsp_init.c | ||
| w64xmmtest.c | ||