[SCM] libav/experimental: mov_read_packet: if dv_get_packet fails, return exactly its error value instead of always -1 (makes no real difference currently since dv_get_packet always returns -1 so far).

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:48:11 UTC 2013


The following commit has been merged in the experimental branch:
commit a2f3851166fab01d472273ce3ef9025d1764bf77
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Wed Jun 24 08:50:46 2009 +0000

    mov_read_packet: if dv_get_packet fails, return exactly its error value
    instead of always -1 (makes no real difference currently since dv_get_packet
    always returns -1 so far).
    
    Originally committed as revision 19262 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 3fb831f..3b9cc26 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2107,8 +2107,9 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
         dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size);
         av_free(pkt->data);
         pkt->size = 0;
-        if (dv_get_packet(mov->dv_demux, pkt) < 0)
-            return -1;
+        ret = dv_get_packet(mov->dv_demux, pkt);
+        if (ret < 0)
+            return ret;
     }
 #endif
     pkt->stream_index = sc->ffindex;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list