diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 09:50:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 09:51:19 +0200 |
| commit | f6beb3611534e131b3f95036799b32735f6ab2f2 (patch) | |
| tree | 7a76bc8b7beb2d4571a8b304d9097069fe0defe2 /libavformat/utils.c | |
| parent | 197e219c927c81b38460482970faddfdb875817d (diff) | |
| parent | c330eba84cf2370ad72423aa9e410e20afdc52e2 (diff) | |
Merge commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2'
* commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2':
lavf: preserve side data when parsing packets.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 2c62d304c2..baa717701a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1342,6 +1342,13 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt, int stream_index) if (!out_pkt.size) continue; + if (pkt->side_data) { + out_pkt.side_data = pkt->side_data; + out_pkt.side_data_elems = pkt->side_data_elems; + pkt->side_data = NULL; + pkt->side_data_elems = 0; + } + /* set the duration */ out_pkt.duration = 0; if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { |