Always return 0 if read_packet is successful.
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Tue, 7 Apr 2009 21:25:02 +0000 (21:25 +0000)
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>
Tue, 7 Apr 2009 21:25:02 +0000 (21:25 +0000)
Originally committed as revision 18360 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/nuv.c

index 2d6e93a79cdea4123afc21fca6ca71549343facb..b643229429d532a1768d8481ed707c843ea6df7a 100644 (file)
@@ -226,7 +226,8 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
                 pkt->stream_index = ctx->v_id;
                 memcpy(pkt->data, hdr, copyhdrsize);
                 ret = get_buffer(pb, pkt->data + copyhdrsize, size);
                 pkt->stream_index = ctx->v_id;
                 memcpy(pkt->data, hdr, copyhdrsize);
                 ret = get_buffer(pb, pkt->data + copyhdrsize, size);
-                return ret;
+                if (ret < 0) return ret;
+                return 0;
             case NUV_AUDIO:
                 if (ctx->a_id < 0) {
                     av_log(s, AV_LOG_ERROR, "Audio packet in file without audio stream!\n");
             case NUV_AUDIO:
                 if (ctx->a_id < 0) {
                     av_log(s, AV_LOG_ERROR, "Audio packet in file without audio stream!\n");
@@ -238,7 +239,8 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
                 pkt->pos = pos;
                 pkt->pts = AV_RL32(&hdr[4]);
                 pkt->stream_index = ctx->a_id;
                 pkt->pos = pos;
                 pkt->pts = AV_RL32(&hdr[4]);
                 pkt->stream_index = ctx->a_id;
-                return ret;
+                if (ret < 0) return ret;
+                return 0;
             case NUV_SEEKP:
                 // contains no data, size value is invalid
                 break;
             case NUV_SEEKP:
                 // contains no data, size value is invalid
                 break;