[FFmpeg-cvslog] r18360 - trunk/libavformat/nuv.c
reimar
subversion
Tue Apr 7 23:25:02 CEST 2009
Author: reimar
Date: Tue Apr 7 23:25:02 2009
New Revision: 18360
Log:
Always return 0 if read_packet is successful.
Modified:
trunk/libavformat/nuv.c
Modified: trunk/libavformat/nuv.c
==============================================================================
--- trunk/libavformat/nuv.c Tue Apr 7 23:16:11 2009 (r18359)
+++ trunk/libavformat/nuv.c Tue Apr 7 23:25:02 2009 (r18360)
@@ -226,7 +226,8 @@ static int nuv_packet(AVFormatContext *s
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
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;
More information about the ffmpeg-cvslog
mailing list