Merge remote-tracking branch 'dwbuiten/master'

[ffmpeg] / libavcodec / bitstream.c

diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index 506eb336a010b88ec9bfbbfdd74d5a122e3ef91b..0d3f59792cafe9d47e1a01f84135c23861c1c952 100644 (file)
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -28,6 +28,7 @@
  * bitstream api.
  */
 
+#include "libavutil/avassert.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "put_bits.h"
@@ -283,7 +284,7 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
 
     buf = av_malloc((nb_codes+1)*sizeof(VLCcode));
 
-    assert(symbols_size <= 2 || !symbols);
+    av_assert0(symbols_size <= 2 || !symbols);
     j = 0;
 #define COPY(condition)\
     for (i = 0; i < nb_codes; i++) {\