RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffmpeg: fix mixed merged & split side data with the stream->packet hack 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-18 01:01:38 +02:00
parent cdc166acd8
commit e48fb4e1a5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.c
View File

@ -3323,6 +3323,8 @@ static int process_input(int file_index)
/* add the stream-global side data to the first packet */ /* add the stream-global side data to the first packet */
if (ist->nb_packets == 1) if (ist->nb_packets == 1)
if (ist->st->nb_side_data)
av_packet_split_side_data(&pkt);
for (i = 0; i < ist->st->nb_side_data; i++) { for (i = 0; i < ist->st->nb_side_data; i++) {
AVPacketSideData *src_sd = &ist->st->side_data[i]; AVPacketSideData *src_sd = &ist->st->side_data[i];
uint8_t *dst_data; uint8_t *dst_data;