aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/kmvc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-06-27 03:32:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-06-27 03:32:45 +0200
commitf211d9d8391c15e7408b8468dd7430eae2514544 (patch)
treef432096b52ab7971a7ca7fb05db18dcc1cfcb3a5 /libavcodec/kmvc.c
parent721719dd0c0321b47500fa49b649c78422e910aa (diff)
parent659aa20e56de03b461afdaa6ae7e5d4be6e0d5fc (diff)
downloadffmpeg-f211d9d8391c15e7408b8468dd7430eae2514544.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: build: improve rules for test programs build: factor out the .c and .S compile commands as a macro swscale: remove unused xInc/srcW arguments from hScale(). H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit H.264: make filter_mb_fast support 4:4:4 mpeg4videoenc: Remove disabled variant of mpeg4_encode_block(). configure: allow post-fixed cpu strings for athlon64, k8, and opteron when setting the -march flag. Move some variable declarations below the proper #ifdefs. Conflicts: Makefile ffplay.c libswscale/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/kmvc.c')
0 files changed, 0 insertions, 0 deletions