mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-28 21:50:37 +00:00
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). Originally committed as revision 18446 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
cdbe3798d2
commit
cfb9b3550b
@ -320,8 +320,6 @@ static int wc3_read_packet(AVFormatContext *s,
|
||||
ret= av_get_packet(pb, pkt, size);
|
||||
pkt->stream_index = wc3->video_stream_index;
|
||||
pkt->pts = wc3->pts;
|
||||
if (ret != size)
|
||||
ret = AVERROR(EIO);
|
||||
packet_read = 1;
|
||||
break;
|
||||
|
||||
@ -349,8 +347,6 @@ static int wc3_read_packet(AVFormatContext *s,
|
||||
ret= av_get_packet(pb, pkt, size);
|
||||
pkt->stream_index = wc3->audio_stream_index;
|
||||
pkt->pts = wc3->pts;
|
||||
if (ret != size)
|
||||
ret = AVERROR(EIO);
|
||||
|
||||
/* time to advance pts */
|
||||
wc3->pts++;
|
||||
|
Loading…
Reference in New Issue
Block a user