summaryrefslogtreecommitdiff
path: root/libavcodec/gsm_parser.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-08-12 00:16:13 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-08-12 01:00:20 +0200
commit542562e5abdf801f32a3fad199554428aca8083b (patch)
treed58415a161257e09f6a06257341a77c27bffe8d8 /libavcodec/gsm_parser.c
parent107e54c5bf431bebfa79241d43b5fafb572b355a (diff)
avcodec/gsm_parser: Replace codec_id check by assert
A parser should never be called with a mismatching codec Found-by: Ganesh Ajjanagadde <gajjanag@mit.edu> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/gsm_parser.c')
-rw-r--r--libavcodec/gsm_parser.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/gsm_parser.c b/libavcodec/gsm_parser.c
index 9a3b94ef1d..1054a30ca9 100644
--- a/libavcodec/gsm_parser.c
+++ b/libavcodec/gsm_parser.c
@@ -25,6 +25,7 @@
* Splits packets into individual blocks.
*/
+#include "libavutil/avassert.h"
#include "parser.h"
#include "gsm.h"
@@ -55,10 +56,7 @@ static int gsm_parse(AVCodecParserContext *s1, AVCodecContext *avctx,
s->duration = GSM_FRAME_SIZE * 2;
break;
default:
- *poutbuf = buf;
- *poutbuf_size = buf_size;
- av_log(avctx, AV_LOG_ERROR, "Invalid codec_id\n");
- return buf_size;
+ av_assert0(0);
}
}