g723_1dec: remove unneeded cliping that leaked in from merge from libav

[ffmpeg] / libavcodec / libvorbisenc.c

diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c
index 973b3d29c960dfbef32050a699687b4564267a2c..76a912d4390033939f895967e62953da2817b56b 100644 (file)
--- a/libavcodec/libvorbisenc.c
+++ b/libavcodec/libvorbisenc.c
@@ -20,6 +20,7 @@
 
 #include <vorbis/vorbisenc.h>
 
+#include "libavutil/avassert.h"
 #include "libavutil/fifo.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
@@ -28,8 +29,6 @@
 #include "vorbis.h"
 #include "vorbis_parser.h"
 
-#undef NDEBUG
-#include <assert.h>
 
 /* Number of samples the user should send in each call.
  * This value is used because it is the LCD of all possible frame sizes, so
@@ -250,7 +249,7 @@ static av_cold int oggvorbis_encode_init(AVCodecContext *avctx)
     offset += header_comm.bytes;
     memcpy(&p[offset], header_code.packet, header_code.bytes);
     offset += header_code.bytes;
-    assert(offset == avctx->extradata_size);
+    av_assert0(offset == avctx->extradata_size);
 
     if ((ret = avpriv_vorbis_parse_extradata(avctx, &s->vp)) < 0) {
         av_log(avctx, AV_LOG_ERROR, "invalid extradata\n");
@@ -376,7 +375,7 @@ static int oggvorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
 AVCodec ff_libvorbis_encoder = {
     .name           = "libvorbis",
     .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = CODEC_ID_VORBIS,
+    .id             = AV_CODEC_ID_VORBIS,
     .priv_data_size = sizeof(OggVorbisEncContext),
     .init           = oggvorbis_encode_init,
     .encode2        = oggvorbis_encode_frame,