Skip to content

F
ffmpeg
Commit 4eae08b4 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

mjpegdec: use av_assert 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent bc210bfc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
libavcodec/mjpegdec.c
View file @ 4eae08b4
...@@ -30,9 +30,6 @@ ...@@ -30,9 +30,6 @@
* MJPEG decoder. * MJPEG decoder.
*/ */
// #define DEBUG
#include <assert.h>
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
...@@ -52,7 +49,7 @@ static int build_vlc(VLC *vlc, const uint8_t *bits_table, ...@@ -52,7 +49,7 @@ static int build_vlc(VLC *vlc, const uint8_t *bits_table,
uint16_t huff_sym[256]; uint16_t huff_sym[256];
int i; int i;
assert(nb_codes <= 256); av_assert0(nb_codes <= 256);
ff_mjpeg_build_huffman_codes(huff_size, huff_code, bits_table, val_table); ff_mjpeg_build_huffman_codes(huff_size, huff_code, bits_table, val_table);
...@@ -352,7 +349,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) ...@@ -352,7 +349,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG;
} }
} }
assert(s->nb_components == 3); av_assert0(s->nb_components == 3);
break; break;
case 0x12121100: case 0x12121100:
case 0x22122100: case 0x22122100:
......
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