ffmpeg | branch: release/2.6 | Michael Niedermayer <mich...@niedermayer.cc> | Fri Nov 6 02:11:01 2015 +0100| [0b3b993bae22dc83a5b77774cba7b7b5eb30cbb7] | committer: Michael Niedermayer
avformat/xmv: factor return check out of if/else Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit 9b6fac11da470274d4b93d46ef66527aa1824179) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b3b993bae22dc83a5b77774cba7b7b5eb30cbb7 --- libavformat/xmv.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavformat/xmv.c b/libavformat/xmv.c index 45c2464..06c070c 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -549,16 +549,14 @@ static int xmv_read_packet(AVFormatContext *s, /* Fetch a video frame */ result = xmv_fetch_video_packet(s, pkt); - if (result) - return result; - } else { /* Fetch an audio frame */ result = xmv_fetch_audio_packet(s, pkt, xmv->current_stream - 1); - if (result) - return result; } + if (result) + return result; + /* Increase our counters */ if (++xmv->current_stream >= xmv->stream_count) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
