Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 21:11:01 +0000 (23:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 21:11:09 +0000 (23:11 +0200)
commit81babc432ab2faf42c2e7bc96d291a3e8f118c75
tree6e9be7536394bf9192290fd76b027e5851f9870b
parentd52f874c7fa716f49bf35838d6bf0959016f48f6
parenta14b61658c3302081ea5da3ea65b7d9f7b4fb2eb
Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'

* commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb':
  mtv: do not set sample_rate for video

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mtv.c