aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/amr.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-09-29 07:11:56 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-09-29 07:11:56 +0200
commitd87ff555025e90ef285425216c29be95034e2485 (patch)
tree6638488307896e24f2c1ddb9b1be3bad15ea6b50 /libavformat/amr.c
parentface578d56c2d1375e40d5e2a28acc122132bc55 (diff)
downloadandroid_external_ffmpeg-d87ff555025e90ef285425216c29be95034e2485.tar.gz
android_external_ffmpeg-d87ff555025e90ef285425216c29be95034e2485.tar.bz2
android_external_ffmpeg-d87ff555025e90ef285425216c29be95034e2485.zip
Remove an incorrect and unneeded assert in the amr demuxer.
Asserting a specific codec is not correct since libavformat allows forcing a codec, an equivalent check is in the following line. Fixes ticket #3001.
Diffstat (limited to 'libavformat/amr.c')
-rw-r--r--libavformat/amr.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/amr.c b/libavformat/amr.c
index 7201ac3688..db9bb4e59d 100644
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -132,8 +132,6 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt)
};
size = packed_size[mode];
- } else {
- av_assert0(0);
}
if (!size || av_new_packet(pkt, size))