[FFmpeg-cvslog] Merge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  9 13:40:04 2014 +0200| [60ef0c6f909703ae4dc021f6857d254c7badc1ec] | committer: Michael Niedermayer

Merge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf'

* commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf':
  fate: correctly set sample rate for mp2 tests

Conflicts:
	tests/fate/acodec.mak
	tests/lavf-regression.sh

one hunk has been ommited as it breaks fate

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

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