RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-07 07:40:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '355864ef7a9548ee6491a25de1e0650bd983a667'

Browse Source 
* commit '355864ef7a9548ee6491a25de1e0650bd983a667':
  g726: Do not crash on user mistake

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-12 15:08:27 +02:00
commit e72988d3f8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/g726.c
View File

@ -23,7 +23,6 @@
*/ */
#include <limits.h> #include <limits.h>
#include "libavutil/avassert.h"
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avcodec.h" #include "avcodec.h"
@ -316,7 +315,11 @@ static av_cold int g726_encode_init(AVCodecContext *avctx)
"Resample or reduce the compliance level.\n"); "Resample or reduce the compliance level.\n");
return AVERROR(EINVAL); 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){ if(avctx->channels != 1){
av_log(avctx, AV_LOG_ERROR, "Only mono is supported\n"); av_log(avctx, AV_LOG_ERROR, "Only mono is supported\n");