diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-06 02:11:01 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-12 02:55:47 +0100 |
commit | 6ad10cbec954ab00dfa88046e4d309f32773f3e3 (patch) | |
tree | 03b8db35042edc413b429281e4619b2703854be1 | |
parent | b0b1b208f5c7cd783b58cd1527f65b20ff550ffe (diff) | |
download | ffmpeg-6ad10cbec954ab00dfa88046e4d309f32773f3e3.tar.gz |
avformat/xmv: factor return check out of if/else
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9b6fac11da470274d4b93d46ef66527aa1824179)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavformat/xmv.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/xmv.c b/libavformat/xmv.c index 45c24642cc..06c070ca43 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) { |