Browse Source

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>
tags/n2.2-rc1
Michael Niedermayer 11 years ago
parent
commit
c1333a762c
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      libavformat/rtpdec_asf.c

+ 2
- 0
libavformat/rtpdec_asf.c View File

@@ -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) { if (s->streams[stream_index]->id == rt->asf_ctx->streams[i]->id) {
*s->streams[stream_index]->codec = *s->streams[stream_index]->codec =
*rt->asf_ctx->streams[i]->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_size = 0;
rt->asf_ctx->streams[i]->codec->extradata = NULL; rt->asf_ctx->streams[i]->codec->extradata = NULL;
avpriv_set_pts_info(s->streams[stream_index], 32, 1, 1000); avpriv_set_pts_info(s->streams[stream_index], 32, 1, 1000);


Loading…
Cancel
Save