diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 02:17:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 02:31:27 +0200 |
| commit | 5c08c7b2151409c3b7a05e54fe46834deedff119 (patch) | |
| tree | 521e6530dc916911350aa77b350464fdade32da9 /libavformat/utils.c | |
| parent | 94eadee7efc2c5d19ecfe92d36f0556663468080 (diff) | |
| download | ffmpeg-5c08c7b2151409c3b7a05e54fe46834deedff119.tar.gz | |
Add a flag to disable side data merging.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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){ |