summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-09 23:11:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-09 23:11:09 +0200
commit81babc432ab2faf42c2e7bc96d291a3e8f118c75 (patch)
tree6e9be7536394bf9192290fd76b027e5851f9870b
parentd52f874c7fa716f49bf35838d6bf0959016f48f6 (diff)
parenta14b61658c3302081ea5da3ea65b7d9f7b4fb2eb (diff)
downloadffmpeg-streaming-81babc432ab2faf42c2e7bc96d291a3e8f118c75.zip
ffmpeg-streaming-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.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index b449d58..1d5f266 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;
OpenPOWER on IntegriCloud