diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-21 00:09:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-21 01:02:11 +0100 |
| commit | 98fc81b20d6350ba8bb2b3ae936a29bda37d1610 (patch) | |
| tree | 024de29192a92e0fbd84a53c72fc7e661f32c523 /libavformat | |
| parent | e50278348a3144f7de217cede54fc24399a733f8 (diff) | |
avformat/utils: move side data merge after parser
merging before the parser can conflict with the parser, also
future changes depend on it being done later
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 9522909bfc..bae23a10b5 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -701,9 +701,6 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) continue; } - if(!(s->flags & AVFMT_FLAG_KEEP_SIDE_DATA)) - av_packet_merge_side_data(pkt); - if(pkt->stream_index >= (unsigned)s->nb_streams){ av_log(s, AV_LOG_ERROR, "Invalid stream index %d\n", pkt->stream_index); continue; @@ -1401,6 +1398,9 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) if (!got_packet && s->parse_queue) ret = read_from_packet_buffer(&s->parse_queue, &s->parse_queue_end, pkt); + if(ret >= 0 && !(s->flags & AVFMT_FLAG_KEEP_SIDE_DATA)) + av_packet_merge_side_data(pkt); + if(s->debug & FF_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "read_frame_internal stream=%d, pts=%s, dts=%s, size=%d, duration=%d, flags=%d\n", pkt->stream_index, |