aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/movsub_bsf.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-29 13:29:26 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-29 13:35:56 +0100
commit7dc0ed80e877a16a11ba45d747723d88e8a92cd8 (patch)
treeb1842c70bb437b14e16ca833443615a2a267c2b8 /libavcodec/movsub_bsf.c
parenta7eabbb20dc077d7380f874b9c35fffa478186a6 (diff)
parent1f3f896564501c23b44fcf605567c78ce066b539 (diff)
downloadffmpeg-7dc0ed80e877a16a11ba45d747723d88e8a92cd8.tar.gz
Merge commit '1f3f896564501c23b44fcf605567c78ce066b539'
* commit '1f3f896564501c23b44fcf605567c78ce066b539': fate: Add dependencies for Vorbis, ProRes, QTRLE, utvideo tests fate: real: Add dependencies fate: lossless-audio: Add dependencies x86: h264dsp: Fix linking with yasm and optimizations disabled Conflicts: libavcodec/x86/h264dsp_init.c tests/fate/lossless-audio.mak tests/fate/real.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/movsub_bsf.c')
0 files changed, 0 insertions, 0 deletions