summaryrefslogtreecommitdiffstats
path: root/libavresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-18 13:36:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-18 13:36:39 +0100
commit17596198cacbb7277f1d9641f0a76fe62ebf155d (patch)
tree1c35aa3df1c1b2b92f942b5f83b3f80ea42d0ad5 /libavresample
parenta003c5bd4ff1846edba0518306f8091c14041c96 (diff)
parent80ac87c13dc8c6c063e26a464c5c542357c0583f (diff)
downloadffmpeg-streaming-17596198cacbb7277f1d9641f0a76fe62ebf155d.zip
ffmpeg-streaming-17596198cacbb7277f1d9641f0a76fe62ebf155d.tar.gz
Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'
* commit '80ac87c13dc8c6c063e26a464c5c542357c0583f': lavc: support ZenoXVID custom tag libcdio: support recent cdio-paranoia float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window theora: Skip zero-sized headers Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud