summaryrefslogtreecommitdiff
path: root/libavcodec/g726.c
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2015-07-11 11:47:13 +0200
committerLuca Barbato <lu_zero@gentoo.org>2015-07-11 18:45:44 +0200
commit355864ef7a9548ee6491a25de1e0650bd983a667 (patch)
tree1d1fbb3d99e9ce8f89188e2b72fffd3c3a62b708 /libavcodec/g726.c
parent87f98a2b9d4c7218ad82bb45347a53b65e5244f3 (diff)
g726: Do not crash on user mistake
Properly report the sample rate as invalid CC: libav-stable@libav.org
Diffstat (limited to 'libavcodec/g726.c')
-rw-r--r--libavcodec/g726.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index 9ad91f238e..b877687384 100644
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -23,7 +23,6 @@
*/
#include <limits.h>
-#include "libavutil/avassert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/opt.h"
#include "avcodec.h"
@@ -315,7 +314,11 @@ static av_cold int g726_encode_init(AVCodecContext *avctx)
"Resample or reduce the compliance level.\n");
return AVERROR(EINVAL);
}
- av_assert0(avctx->sample_rate > 0);
+ if (avctx->sample_rate <= 0) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid sample rate %d\n",
+ avctx->sample_rate);
+ return AVERROR(EINVAL);
+ }
if(avctx->channels != 1){
av_log(avctx, AV_LOG_ERROR, "Only mono is supported\n");