[FFmpeg-cvslog] Merge commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 18 10:29:17 2012 +0200| [17e4b0644b5ad13733bd863b14ab11ffa955009c] | committer: Michael Niedermayer

Merge commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b'

* commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b':
  fate: dependencies for acodec tests
  fate: dependencies for vsynth tests
  fate: add macros useful for conditionally enabling things
  libmp3lame: resize the output buffer if needed

Conflicts:
	tests/fate/acodec.mak
	tests/fate/vcodec.mak

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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