From b0723c8a12c1371016e97eb2d8efea52f8fdaf41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Tue, 7 Apr 2009 21:25:02 +0000 Subject: [PATCH] Always return 0 if read_packet is successful. Originally committed as revision 18360 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/nuv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/nuv.c b/libavformat/nuv.c index 2d6e93a79c..b643229429 100644 --- a/libavformat/nuv.c +++ b/libavformat/nuv.c @@ -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); - 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"); @@ -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; - return ret; + if (ret < 0) return ret; + return 0; case NUV_SEEKP: // contains no data, size value is invalid break;