Commit f7835507 authored by Michael Niedermayer's avatar Michael Niedermayer

consistant error return for asf_get_packet()

Originally committed as revision 7657 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 92216453
...@@ -466,6 +466,10 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -466,6 +466,10 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
default: var = defval; break; \ default: var = defval; break; \
} }
/**
*
* @return <0 in case of an error
*/
static int asf_get_packet(AVFormatContext *s) static int asf_get_packet(AVFormatContext *s)
{ {
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
...@@ -483,7 +487,7 @@ static int asf_get_packet(AVFormatContext *s) ...@@ -483,7 +487,7 @@ static int asf_get_packet(AVFormatContext *s)
if (get_le16(pb) != 0) { if (get_le16(pb) != 0) {
if (!url_feof(pb)) if (!url_feof(pb))
av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n"); av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n");
return AVERROR_IO; return -1;
} }
rsize+=2; rsize+=2;
/* }else{ /* }else{
......
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