Commit effdc8ef authored by Michael Niedermayer's avatar Michael Niedermayer

return cleanup

Originally committed as revision 6632 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c74915cd
...@@ -48,7 +48,7 @@ static int amr_write_header(AVFormatContext *s) ...@@ -48,7 +48,7 @@ static int amr_write_header(AVFormatContext *s)
} }
else else
{ {
//This is an error! return -1;
} }
put_flush_packet(pb); put_flush_packet(pb);
return 0; return 0;
...@@ -168,8 +168,6 @@ static int amr_read_packet(AVFormatContext *s, ...@@ -168,8 +168,6 @@ static int amr_read_packet(AVFormatContext *s,
av_free_packet(pkt); av_free_packet(pkt);
return AVERROR_IO; return AVERROR_IO;
} }
return 0;
} }
else if(enc->codec_id == CODEC_ID_AMR_WB) else if(enc->codec_id == CODEC_ID_AMR_WB)
{ {
...@@ -203,13 +201,12 @@ static int amr_read_packet(AVFormatContext *s, ...@@ -203,13 +201,12 @@ static int amr_read_packet(AVFormatContext *s,
av_free_packet(pkt); av_free_packet(pkt);
return AVERROR_IO; return AVERROR_IO;
} }
return 0;
} }
else else
{ {
return AVERROR_IO; assert(0);
} }
return 0;
} }
static int amr_read_close(AVFormatContext *s) static int amr_read_close(AVFormatContext *s)
......
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