Merge commit '1f3f896564501c23b44fcf605567c78ce066b539'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 12:29:26 +0000 (13:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 12:35:56 +0000 (13:35 +0100)
commit7dc0ed80e877a16a11ba45d747723d88e8a92cd8
treeb1842c70bb437b14e16ca833443615a2a267c2b8
parenta7eabbb20dc077d7380f874b9c35fffa478186a6
parent1f3f896564501c23b44fcf605567c78ce066b539
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>
libavcodec/x86/h264dsp_init.c
tests/fate/lossless-audio.mak
tests/fate/prores.mak
tests/fate/real.mak
tests/fate/utvideo.mak