diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-28 23:42:40 +0300 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-01-07 09:43:57 +0100 |
| commit | 5e8243e843be8f71da7dde199a71d095726533eb (patch) | |
| tree | bdc61dde2009fadd613a2c9e756f662f40034064 | |
| parent | 416ad3ecf242946034a552f39718b6aaaa98c272 (diff) | |
| download | ffmpeg-5e8243e843be8f71da7dde199a71d095726533eb.tar.gz | |
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>
(cherry picked from commit 9fc7184d1a9af8d97b3fc5c2ef9d0a647d6617ea)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ad1223d6bcc69e1639951aedcdae40822bf41042)
| -rw-r--r-- | libavformat/bfi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/bfi.c b/libavformat/bfi.c index bb02e85581..c0b5681744 100644 --- a/libavformat/bfi.c +++ b/libavformat/bfi.c @@ -138,9 +138,7 @@ static int bfi_read_packet(AVFormatContext * s, AVPacket * pkt) pkt->pts = bfi->audio_frame; bfi->audio_frame += ret; - } - - else { + } else if (bfi->video_size > 0) { //Tossing a video packet at the video decoder. ret = av_get_packet(pb, pkt, bfi->video_size); @@ -152,6 +150,9 @@ static int bfi_read_packet(AVFormatContext * s, AVPacket * pkt) /* One less frame to read. A cursory decrement. */ bfi->nframes--; + } else { + /* Empty video packet */ + ret = AVERROR(EAGAIN); } bfi->avflag = !bfi->avflag; |