diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 18:02:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 18:02:42 +0200 |
| commit | c0d62d999d0ecf072b6352f346b7e17841f2598c (patch) | |
| tree | c143cea8d376f1af902089782d6f6a3efceb9bde /libavformat | |
| parent | 289f02f923ace4540829c8ee2ca729bf7680fd23 (diff) | |
| download | ffmpeg-c0d62d999d0ecf072b6352f346b7e17841f2598c.tar.gz | |
avformat/utils: factorize if()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 685a5fe752..768acd4be0 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1545,10 +1545,10 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) } st->global_side_data_injected = 1; } - } - if (ret >= 0 && !(s->flags & AVFMT_FLAG_KEEP_SIDE_DATA)) - av_packet_merge_side_data(pkt); + if (!(s->flags & AVFMT_FLAG_KEEP_SIDE_DATA)) + av_packet_merge_side_data(pkt); + } if (s->debug & FF_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, |