From: Michael Niedermayer Date: Tue, 10 Oct 2006 23:28:27 +0000 (+0000) Subject: return cleanup X-Git-Tag: v0.5~11459 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=effdc8ef2aba69423b02b3decd717b9272e43388;ds=sidebyside return cleanup Originally committed as revision 6632 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavformat/amr.c b/libavformat/amr.c index 94d737a5cf..6faad121ba 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -48,7 +48,7 @@ static int amr_write_header(AVFormatContext *s) } else { - //This is an error! + return -1; } put_flush_packet(pb); return 0; @@ -168,8 +168,6 @@ static int amr_read_packet(AVFormatContext *s, av_free_packet(pkt); return AVERROR_IO; } - - return 0; } else if(enc->codec_id == CODEC_ID_AMR_WB) { @@ -203,13 +201,12 @@ static int amr_read_packet(AVFormatContext *s, av_free_packet(pkt); return AVERROR_IO; } - - return 0; } else { - return AVERROR_IO; + assert(0); } + return 0; } static int amr_read_close(AVFormatContext *s)