|
|
|
@@ -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) { |
|
|
|
|