diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-06 02:11:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-06 12:40:49 +0100 |
| commit | a3ff74c872ab7fe1e7a9ad32b2622d4aa18aea50 (patch) | |
| tree | c57d18973844b1b165dada1f03be55dd15b4709b | |
| parent | 51ac1ce9668f6918593b0a937b9b98713f29e2e4 (diff) | |
| download | ffmpeg-a3ff74c872ab7fe1e7a9ad32b2622d4aa18aea50.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 6eac4d21e8..cee2c806de 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -547,16 +547,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) { |