mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-04-20 09:30:20 +00:00
7e944159c6
* qatar/master: (25 commits) vcr1: Add vcr1_ prefixes to all static functions with generic names. vcr1: Fix return type of common_init to match the function pointer signature. vcr1enc: Replace obsolete get_bit_count by put_bits_count/flush_put_bits. motion-test: remove disabled code gxfenc: remove disabled half-implemented MJPEG tag x86: use more standard construct for setting ASM functions in FFT code fate: westwood-aud: disable decoding fate: caf: disable decoding fate: film-cvid: drop pcm audio and rename test fate: d-cinema-demux: drop unnecessary flags fate: split off dpcm-interplay from interplay-mve tests fate: rename funcom-iss to adpcm-ima-iss fate: rename cryo-apc to adpcm-ima-apc fate: rename adpcm-psx-str-v3 to adpcm-xa fate: split off adpcm-ms-mono test from dxa-feeble fate: split off adpcm-ima-ws test from vqa-cc fate: add adpcm-ima-smjpeg test fate: split off adpcm-ima-amv from amv test fate: separate bmv audio and video tests fate: separate delphine-cin audio and video tests ... Conflicts: doc/platform.texi libavcodec/vcr1.c tests/fate/audio.mak tests/fate/demux.mak tests/fate/video.mak tests/ref/fate/ea-mad-pcm-planar tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mtv tests/ref/fate/qtrle-1bit tests/ref/fate/qtrle-2bit tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/vqa-cc 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 | ||
| fft_sse.c | ||
| 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 | ||