diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-06 02:11:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-06 02:55:13 +0100 |
| commit | 2817eb514cb724290e9b2265bd89c47dfc76348c (patch) | |
| tree | 41b175b293e3f071e6c5ff1137f8c781486190a5 | |
| parent | 6e085f9a324e54925373a2816378426b7cfd0d04 (diff) | |
| download | ffmpeg-2817eb514cb724290e9b2265bd89c47dfc76348c.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) { |