aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2014-01-23 14:07:46 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-01-27 15:45:10 +0100
commitd0e0329e9d3d2a330dfe9e66d2b30aa6e36db5d6 (patch)
treea971311082d25083f4ff31fe27e60cc2ad7ecb2a
parent9ca79d2849896685cf372e0940952b816dc04ea9 (diff)
downloadffmpeg-d0e0329e9d3d2a330dfe9e66d2b30aa6e36db5d6.tar.gz
rtpdec_asf: Copy the need_parsing field from the chained demuxer
This fixes playback of mp3 streams in rtp/asf. This used to work until 950482bf, but mostly by coincidence. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 2aec9e228cb317cca8cda9e03986c8482ea54404) Fixes ticket #3223
-rw-r--r--libavformat/rtpdec_asf.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c
index 123894f275..541b86fe41 100644
--- a/libavformat/rtpdec_asf.c
+++ b/libavformat/rtpdec_asf.c
@@ -144,6 +144,8 @@ static int asfrtp_parse_sdp_line(AVFormatContext *s, int stream_index,
if (s->streams[stream_index]->id == rt->asf_ctx->streams[i]->id) {
*s->streams[stream_index]->codec =
*rt->asf_ctx->streams[i]->codec;
+ s->streams[stream_index]->need_parsing =
+ rt->asf_ctx->streams[i]->need_parsing;
rt->asf_ctx->streams[i]->codec->extradata_size = 0;
rt->asf_ctx->streams[i]->codec->extradata = NULL;
avpriv_set_pts_info(s->streams[stream_index], 32, 1, 1000);