Merge commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Oct 2012 08:29:17 +0000 (10:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Oct 2012 08:48:00 +0000 (10:48 +0200)
commit17e4b0644b5ad13733bd863b14ab11ffa955009c
tree46cc4748ea765ca0553bac23a49d502c9aed5038
parenteb19d89d8eb51f20299d59558d69d0f057583e7c
parent292d1e78743855404c7d07e3e7cb3f9c9ae6275b
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@gmx.at>
libavcodec/libmp3lame.c
tests/Makefile
tests/fate/acodec.mak
tests/fate/vcodec.mak