bfi: Avoid divisions by zero

If a zero-length video packet is to be returned, just return
AVERROR(EAGAIN) and switch back to the audio stream.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2013-09-28 23:42:40 +03:00
parent a9221e3960
commit 9fc7184d1a

View File

@ -140,9 +140,7 @@ static int bfi_read_packet(AVFormatContext * s, AVPacket * pkt)
pkt->pts = bfi->audio_frame; pkt->pts = bfi->audio_frame;
bfi->audio_frame += ret; bfi->audio_frame += ret;
} } else if (bfi->video_size > 0) {
else {
//Tossing a video packet at the video decoder. //Tossing a video packet at the video decoder.
ret = av_get_packet(pb, pkt, bfi->video_size); ret = av_get_packet(pb, pkt, bfi->video_size);
@ -154,6 +152,9 @@ static int bfi_read_packet(AVFormatContext * s, AVPacket * pkt)
/* One less frame to read. A cursory decrement. */ /* One less frame to read. A cursory decrement. */
bfi->nframes--; bfi->nframes--;
} else {
/* Empty video packet */
ret = AVERROR(EAGAIN);
} }
bfi->avflag = !bfi->avflag; bfi->avflag = !bfi->avflag;