Merge commit 'a14b6165'

* commit 'a14b6165':
  mtv: do not set sample_rate for video
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/mtv.c

@@ -170,7 +170,6 @@ static int mtv_read_header(AVFormatContext *s)
     st->codec->pix_fmt         = AV_PIX_FMT_RGB565BE;
     st->codec->width           = mtv->img_width;
     st->codec->height          = mtv->img_height;
-    st->codec->sample_rate     = mtv->video_fps;
     st->codec->extradata       = av_strdup("BottomUp");
     st->codec->extradata_size  = 9;