Merge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Apr 2014 11:40:04 +0000 (13:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Apr 2014 11:58:55 +0000 (13:58 +0200)
commit60ef0c6f909703ae4dc021f6857d254c7badc1ec
treef03160a80bdb19f4448dcd31fdfc4a8e2aa22d89
parentc740e083bc46f5380367627852a262f049a5e717
parent60fd7d36c47d62d4c603bf16c213b1a924f5cfcf
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@gmx.at>
tests/lavf-regression.sh