[FFmpeg-cvslog] Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  9 23:11:01 2014 +0200| [81babc432ab2faf42c2e7bc96d291a3e8f118c75] | committer: Michael Niedermayer

Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'

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

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

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