[FFmpeg-cvslog] g726enc: use av_assert0() for sample_rate validation

Justin Ruggles git at videolan.org
Thu Nov 3 02:23:05 CET 2011


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Thu Oct 27 20:47:08 2011 -0400| [50c466d609ec60a324a7a776dfdb57c8d38faa11] | committer: Justin Ruggles

g726enc: use av_assert0() for sample_rate validation

This should never happen, but the check avoids a divide-by-zero.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50c466d609ec60a324a7a776dfdb57c8d38faa11
---

 libavcodec/g726.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index 12a37e0..ffddf95 100644
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -22,6 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <limits.h>
+#include "libavutil/avassert.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "put_bits.h"
@@ -309,10 +310,7 @@ static av_cold int g726_encode_init(AVCodecContext *avctx)
                "Resample or reduce the compliance level.\n");
         return AVERROR(EINVAL);
     }
-    if (avctx->sample_rate <= 0) {
-        av_log(avctx, AV_LOG_ERROR, "Samplerate is invalid\n");
-        return -1;
-    }
+    av_assert0(avctx->sample_rate > 0);
 
     if(avctx->channels != 1){
         av_log(avctx, AV_LOG_ERROR, "Only mono is supported\n");



More information about the ffmpeg-cvslog mailing list