OSDN Git Service

mov_read_packet: if dv_get_packet fails, return exactly its error value
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Wed, 24 Jun 2009 08:50:46 +0000 (08:50 +0000)
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>
Wed, 24 Jun 2009 08:50:46 +0000 (08:50 +0000)
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

libavformat/mov.c

index 3fb831f..3b9cc26 100644 (file)
@@ -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;