diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 15:08:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 15:08:30 +0200 |
| commit | e72988d3f804fbcf628fa95cb7374ac05ae61d84 (patch) | |
| tree | 44350c83ea935308b1329666907110679274dbeb | |
| parent | 3a18d3fa047535980aa5368ebfda30ee0f1579cc (diff) | |
| parent | 355864ef7a9548ee6491a25de1e0650bd983a667 (diff) | |
| download | ffmpeg-e72988d3f804fbcf628fa95cb7374ac05ae61d84.tar.gz | |
Merge commit '355864ef7a9548ee6491a25de1e0650bd983a667'
* commit '355864ef7a9548ee6491a25de1e0650bd983a667':
g726: Do not crash on user mistake
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/g726.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 5bbf897107..6544e32d94 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" @@ -316,7 +315,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"); |