behaviour of av_get_packet and should not be override without good reason.
As a side effect this fixes the memleak described in issue 956.
Also return the exact error code from av_get_packet instead of AVERROR(EIO).
Originally committed as revision 18428 to svn://svn.ffmpeg.org/ffmpeg/trunk
chunk_size -= 12;
}
ret = av_get_packet(pb, pkt, chunk_size);
- if (ret != chunk_size)
- ret = AVERROR(EIO);
- else {
+ if (ret < 0)
+ return ret;
pkt->stream_index = ea->audio_stream_index;
pkt->pts = 90000;
pkt->pts *= ea->audio_frame_counter;
ea->audio_frame_counter += chunk_size /
(ea->bytes * ea->num_channels);
}
- }
packet_read = 1;
break;
case MV0F_TAG:
get_video_packet:
ret = av_get_packet(pb, pkt, chunk_size);
- if (ret != chunk_size)
- ret = AVERROR_IO;
- else {
+ if (ret < 0)
+ return ret;
pkt->stream_index = ea->video_stream_index;
pkt->flags |= key;
- }
packet_read = 1;
break;