diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 23:11:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 23:11:09 +0200 |
| commit | 81babc432ab2faf42c2e7bc96d291a3e8f118c75 (patch) | |
| tree | 6e9be7536394bf9192290fd76b027e5851f9870b | |
| parent | d52f874c7fa716f49bf35838d6bf0959016f48f6 (diff) | |
| parent | a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb (diff) | |
| download | ffmpeg-81babc432ab2faf42c2e7bc96d291a3e8f118c75.tar.gz | |
Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'
* commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb':
mtv: do not set sample_rate for video
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mtv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/mtv.c b/libavformat/mtv.c index b449d5886f..1d5f26673a 100644 --- a/libavformat/mtv.c +++ b/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; |