git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
289f02f
)
avformat/utils: factorize if()
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 13 Apr 2014 16:02:42 +0000
(18:02 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 13 Apr 2014 16:02:42 +0000
(18:02 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c
patch
|
blob
|
history
diff --git
a/libavformat/utils.c
b/libavformat/utils.c
index
685a5fe
..
768acd4
100644
(file)
--- 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,