diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-20 03:25:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 02:31:27 +0200 |
| commit | 94eadee7efc2c5d19ecfe92d36f0556663468080 (patch) | |
| tree | cc6a7f94e04be1f2d92bc7e9af6eeea0a0646b5f /libavformat | |
| parent | 007f773942e5c8f39e9ad880d8e7e71f8f3bf7d2 (diff) | |
| download | ffmpeg-94eadee7efc2c5d19ecfe92d36f0556663468080.tar.gz | |
Merge/split side data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 3509620c20..8d9f9799cc 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -672,6 +672,8 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt) s->streams[i]->request_probe = -1; continue; } + + av_packet_merge_side_data(pkt); st= s->streams[pkt->stream_index]; switch(st->codec->codec_type){ |