highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/xmv: factor return check out of if/else

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9b6fac11da)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2015-11-06 02:11:01 +01:00
parent 6e085f9a32
commit 2817eb514c
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/xmv.c
View File

@@ -549,16 +549,14 @@ static int xmv_read_packet(AVFormatContext *s,
/* Fetch a video frame */ /* Fetch a video frame */
result = xmv_fetch_video_packet(s, pkt); result = xmv_fetch_video_packet(s, pkt);
if (result)
return result;
} else { } else {
/* Fetch an audio frame */ /* Fetch an audio frame */
result = xmv_fetch_audio_packet(s, pkt, xmv->current_stream - 1); result = xmv_fetch_audio_packet(s, pkt, xmv->current_stream - 1);
}
if (result) if (result)
return result; return result;
}
/* Increase our counters */ /* Increase our counters */
if (++xmv->current_stream >= xmv->stream_count) { if (++xmv->current_stream >= xmv->stream_count) {