diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-23 20:15:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-23 20:15:21 +0100 |
| commit | c1333a762c0e3d832f2142c63c918888ff32a618 (patch) | |
| tree | 7775ec919f0beeefb47b9276173f3d0c1cffec5f /libavformat/rtpdec_asf.c | |
| parent | 094516a5d0f8ebdb09464d6a4d1757ecb38622f6 (diff) | |
| parent | 2aec9e228cb317cca8cda9e03986c8482ea54404 (diff) | |
| download | ffmpeg-c1333a762c0e3d832f2142c63c918888ff32a618.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec_asf: Copy the need_parsing field from the chained demuxer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_asf.c')
| -rw-r--r-- | libavformat/rtpdec_asf.c | 2 |
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); |