mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-24 11:49:48 +00:00
avformat/utils: factorize if()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
289f02f923
commit
c0d62d999d
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user