generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/utils: factorize if()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-13 18:02:42 +02:00
parent 289f02f923
commit c0d62d999d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/utils.c
View File

@ -1545,10 +1545,10 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
} }
st->global_side_data_injected = 1; st->global_side_data_injected = 1;
} }
}
if (ret >= 0 && !(s->flags & AVFMT_FLAG_KEEP_SIDE_DATA)) if (!(s->flags & AVFMT_FLAG_KEEP_SIDE_DATA))
av_packet_merge_side_data(pkt); av_packet_merge_side_data(pkt);
}
if (s->debug & FF_FDEBUG_TS) if (s->debug & FF_FDEBUG_TS)
av_log(s, AV_LOG_DEBUG, av_log(s, AV_LOG_DEBUG,