aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/x86/yadif.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-14 20:12:47 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-14 20:17:24 +0200
commit7e944159c63c4d4504cf76f90bb668519c3109af (patch)
tree99c916277e5523ae607f50cdde69030513b70d39 /libavfilter/x86/yadif.c
parent281bde27894f994d0982ab9283f15d6073ae352c (diff)
parent100c70b0481b889d522b4fc2aac5b948ddb05c70 (diff)
downloadffmpeg-7e944159c63c4d4504cf76f90bb668519c3109af.tar.gz
Merge remote-tracking branch 'qatar/master'
* 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>
Diffstat (limited to 'libavfilter/x86/yadif.c')
0 files changed, 0 insertions, 0 deletions