summaryrefslogtreecommitdiff
path: root/libavformat/amr.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2006-10-10 23:28:27 +0000
committerMichael Niedermayer <michaelni@gmx.at>2006-10-10 23:28:27 +0000
commiteffdc8ef2aba69423b02b3decd717b9272e43388 (patch)
treec5ec975b24f45e6f7d57ba4539f370ff862439bf /libavformat/amr.c
parentc74915cda4e32b2765707ba39345814050c87b4d (diff)
downloadffmpeg-effdc8ef2aba69423b02b3decd717b9272e43388.tar.gz
return cleanup
Originally committed as revision 6632 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/amr.c')
-rw-r--r--libavformat/amr.c9
1 files changed, 3 insertions, 6 deletions
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)