diff options
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 8d9f9799cc..c5e570028e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -673,7 +673,8 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt) continue; } - av_packet_merge_side_data(pkt); + if(!(s->flags & AVFMT_FLAG_KEEP_SIDE_DATA)) + av_packet_merge_side_data(pkt); st= s->streams[pkt->stream_index]; switch(st->codec->codec_type){ |