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)
* commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb':
  mtv: do not set sample_rate for video

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

Simple merge