aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mlib/dsputil_mlib.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-21 02:46:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-21 03:40:53 +0100
commit3be1a4ba9a9d926674b33051d6539fe8d8a4106c (patch)
treec92779c80a98d94133dde283a86c4b4547dc16ab /libavcodec/mlib/dsputil_mlib.c
parent134aaa79f7f1ce1df64afc7d10d2b3de77df7b08 (diff)
parent37c0dc626d2f8254ef623d987eb5077f9120755f (diff)
downloadffmpeg-3be1a4ba9a9d926674b33051d6539fe8d8a4106c.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: lavc: always align height by 32 pixel raw: add 10bit YUV definitions nut: support 10bit YUV mpegvideo_enc: separate declarations and statements oma: make header compile standalone vp3: Reorder some functions to fix VP3 build with Theora disabled. build: fix standalone compilation of ADX encoder build: fix standalone compilation of ADPCM decoders build: fix standalone compilation of mpc7/mpc8 decoders 4xm: Use bytestream2 functions to prevent overreads bytestream: add a new set of bytestream functions with overread checking mpegts: Suppress invalid timebase warnings on DMB streams. mpegts: Fix typo in handling sections in the PMT. vc1dec: Use the right pointer type for the tmp pointer Conflicts: libavcodec/4xm.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/vp3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlib/dsputil_mlib.c')
0 files changed, 0 insertions, 0 deletions