[SCM] libav/experimental: check av_get_packet return value

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:39:10 UTC 2013


The following commit has been merged in the experimental branch:
commit bc64cb96805fc6ae435b39c7ba1052304a27f5b5
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sun Feb 22 01:07:46 2009 +0000

    check av_get_packet return value
    
    Originally committed as revision 17514 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 449bbc7..4f40949 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1942,7 +1942,7 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
     MOVStreamContext *sc = 0;
     AVIndexEntry *sample = 0;
     int64_t best_dts = INT64_MAX;
-    int i;
+    int i, ret;
  retry:
     for (i = 0; i < s->nb_streams; i++) {
         AVStream *st = s->streams[i];
@@ -1979,7 +1979,9 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
                sc->ffindex, sample->pos);
         return -1;
     }
-    av_get_packet(sc->pb, pkt, sample->size);
+    ret = av_get_packet(sc->pb, pkt, sample->size);
+    if (ret < 0)
+        return ret;
 #if CONFIG_DV_DEMUXER
     if (mov->dv_demux && sc->dv_audio_container) {
         dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list