Commit 0549392d authored by reimar's avatar reimar

wc3movie: return partial packets if not all data can be read.

This is consistent with other demuxer's behaviour and avoids a memleak.
It also returns the error from av_get_packet instead of always AVERROR(EIO).


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18446 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent f41e5c8f
...@@ -320,8 +320,6 @@ static int wc3_read_packet(AVFormatContext *s, ...@@ -320,8 +320,6 @@ static int wc3_read_packet(AVFormatContext *s,
ret= av_get_packet(pb, pkt, size); ret= av_get_packet(pb, pkt, size);
pkt->stream_index = wc3->video_stream_index; pkt->stream_index = wc3->video_stream_index;
pkt->pts = wc3->pts; pkt->pts = wc3->pts;
if (ret != size)
ret = AVERROR(EIO);
packet_read = 1; packet_read = 1;
break; break;
...@@ -349,8 +347,6 @@ static int wc3_read_packet(AVFormatContext *s, ...@@ -349,8 +347,6 @@ static int wc3_read_packet(AVFormatContext *s,
ret= av_get_packet(pb, pkt, size); ret= av_get_packet(pb, pkt, size);
pkt->stream_index = wc3->audio_stream_index; pkt->stream_index = wc3->audio_stream_index;
pkt->pts = wc3->pts; pkt->pts = wc3->pts;
if (ret != size)
ret = AVERROR(EIO);
/* time to advance pts */ /* time to advance pts */
wc3->pts++; wc3->pts++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment