generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make electronicarts demuxer return partial frames, this is the default

Browse Source 
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
This commit is contained in:
Reimar Döffinger
2009-04-11 10:38:56 +00:00
parent facf521daa
commit f772b7fa7d
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/electronicarts.c
View File

@@ -470,9 +470,8 @@ static int ea_read_packet(AVFormatContext *s,
chunk_size -= 12; chunk_size -= 12;
} }
ret = av_get_packet(pb, pkt, chunk_size); ret = av_get_packet(pb, pkt, chunk_size);
if (ret != chunk_size) if (ret < 0)
ret = AVERROR(EIO); return ret;
else {
pkt->stream_index = ea->audio_stream_index; pkt->stream_index = ea->audio_stream_index;
pkt->pts = 90000; pkt->pts = 90000;
pkt->pts *= ea->audio_frame_counter; pkt->pts *= ea->audio_frame_counter;
@@ -493,7 +492,6 @@ static int ea_read_packet(AVFormatContext *s,
ea->audio_frame_counter += chunk_size / ea->audio_frame_counter += chunk_size /
(ea->bytes * ea->num_channels); (ea->bytes * ea->num_channels);
} }
}
packet_read = 1; packet_read = 1;
break; break;
@@ -531,12 +529,10 @@ static int ea_read_packet(AVFormatContext *s,
case MV0F_TAG: case MV0F_TAG:
get_video_packet: get_video_packet:
ret = av_get_packet(pb, pkt, chunk_size); ret = av_get_packet(pb, pkt, chunk_size);
if (ret != chunk_size) if (ret < 0)
ret = AVERROR_IO; return ret;
else {
pkt->stream_index = ea->video_stream_index; pkt->stream_index = ea->video_stream_index;
pkt->flags |= key; pkt->flags |= key;
}
packet_read = 1; packet_read = 1;
break; break;