summaryrefslogtreecommitdiff
path: root/libavformat/bfi.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-09-28 23:42:40 +0300
committerMartin Storsjö <martin@martin.st>2013-09-29 19:58:56 +0300
commit9fc7184d1a9af8d97b3fc5c2ef9d0a647d6617ea (patch)
tree1490e3e532bcdb0d829ec5aae123e1386c9592fd /libavformat/bfi.c
parenta9221e39600a31ee13e736e9e47743cde23f0280 (diff)
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>
Diffstat (limited to 'libavformat/bfi.c')
-rw-r--r--libavformat/bfi.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/bfi.c b/libavformat/bfi.c
index e60bbf4cab..5d7ccb85e6 100644
--- a/libavformat/bfi.c
+++ b/libavformat/bfi.c
@@ -140,9 +140,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);
@@ -154,6 +152,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;