[FFmpeg-cvslog] Merge commit '1f3f896564501c23b44fcf605567c78ce066b539'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 29 13:29:26 2012 +0100| [7dc0ed80e877a16a11ba45d747723d88e8a92cd8] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7dc0ed80e877a16a11ba45d747723d88e8a92cd8
---