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

Return any error return values from av_get_packet, get_buffer etc. unchanged

Browse Source 
in the raw demuxers.
Also remove special handling of 0-size reads, if they are due to an error/eof,
these are already converted to the appropriate error by get_buffer.

Originally committed as revision 20137 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger
2009-10-02 06:40:50 +00:00
parent 593b50cedf
commit c3db0bc61d
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/raw.c
View File

@@ -120,9 +120,8 @@ static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
ret= av_get_packet(s->pb, pkt, size); ret= av_get_packet(s->pb, pkt, size);
pkt->stream_index = 0; pkt->stream_index = 0;
if (ret <= 0) { if (ret < 0)
return AVERROR(EIO); return ret;
}
bps= av_get_bits_per_sample(s->streams[0]->codec->codec_id); bps= av_get_bits_per_sample(s->streams[0]->codec->codec_id);
assert(bps); // if false there IS a bug elsewhere (NOT in this function) assert(bps); // if false there IS a bug elsewhere (NOT in this function)
@@ -144,9 +143,9 @@ int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt)
pkt->pos= url_ftell(s->pb); pkt->pos= url_ftell(s->pb);
pkt->stream_index = 0; pkt->stream_index = 0;
ret = get_partial_buffer(s->pb, pkt->data, size); ret = get_partial_buffer(s->pb, pkt->data, size);
if (ret <= 0) { if (ret < 0) {
av_free_packet(pkt); av_free_packet(pkt);
return AVERROR(EIO); return ret;
} }
pkt->size = ret; pkt->size = ret;
return ret; return ret;
@@ -171,8 +170,8 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->dts= pkt->pos / packet_size; pkt->dts= pkt->pos / packet_size;
pkt->stream_index = 0; pkt->stream_index = 0;
if (ret <= 0) if (ret < 0)
return AVERROR(EIO); return ret;
return 0; return 0;
} }
#endif #endif
@@ -206,9 +205,9 @@ static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->pos = url_ftell(s->pb); pkt->pos = url_ftell(s->pb);
pkt->stream_index = 0; pkt->stream_index = 0;
ret = get_buffer(s->pb, pkt->data, size); ret = get_buffer(s->pb, pkt->data, size);
if (ret <= 0) { if (ret < 0) {
av_free_packet(pkt); av_free_packet(pkt);
return AVERROR(EIO); return ret;
} }
pkt->size = ret; pkt->size = ret;
return ret; return ret;