Commit d014e195 authored by Michael Niedermayer's avatar Michael Niedermayer

libvorbisenc: switch to av_assert

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 72a9e646
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <vorbis/vorbisenc.h> #include <vorbis/vorbisenc.h>
#include "libavutil/avassert.h"
#include "libavutil/fifo.h" #include "libavutil/fifo.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avcodec.h" #include "avcodec.h"
...@@ -28,8 +29,6 @@ ...@@ -28,8 +29,6 @@
#include "vorbis.h" #include "vorbis.h"
#include "vorbis_parser.h" #include "vorbis_parser.h"
#undef NDEBUG
#include <assert.h>
/* Number of samples the user should send in each call. /* 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 * 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) ...@@ -250,7 +249,7 @@ static av_cold int oggvorbis_encode_init(AVCodecContext *avctx)
offset += header_comm.bytes; offset += header_comm.bytes;
memcpy(&p[offset], header_code.packet, header_code.bytes); memcpy(&p[offset], header_code.packet, header_code.bytes);
offset += 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) { if ((ret = avpriv_vorbis_parse_extradata(avctx, &s->vp)) < 0) {
av_log(avctx, AV_LOG_ERROR, "invalid extradata\n"); av_log(avctx, AV_LOG_ERROR, "invalid extradata\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment