diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-10 00:18:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-10 00:26:54 +0100 |
| commit | ce6e7a2db1a4fc0c0294b23e3d62a492af0d0359 (patch) | |
| tree | 8727285e507420837afbeeeec0c2c6031dd7f7cd /libavcodec/mjpegenc_common.c | |
| parent | 3e1507a9547ac09b6ff4372123cde09f19218f3d (diff) | |
| download | ffmpeg-ce6e7a2db1a4fc0c0294b23e3d62a492af0d0359.tar.gz | |
avcodec/mjpegenc: Simplify by moving assert into ff_mjpeg_encode_huffman_close()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mjpegenc_common.c')
| -rw-r--r-- | libavcodec/mjpegenc_common.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index 722ad5e4da..70b036daa0 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -444,22 +444,18 @@ static void ff_mjpeg_build_optimal_huffman(MJpegContext *m) ff_mjpeg_encode_huffman_increment(ctx[table_id], code); } - ret = ff_mjpeg_encode_huffman_close(&dc_luminance_ctx, - m->bits_dc_luminance, - m->val_dc_luminance, 12); - av_assert0(!ret); - ret = ff_mjpeg_encode_huffman_close(&dc_chrominance_ctx, - m->bits_dc_chrominance, - m->val_dc_chrominance, 12); - av_assert0(!ret); - ret = ff_mjpeg_encode_huffman_close(&ac_luminance_ctx, - m->bits_ac_luminance, - m->val_ac_luminance, 256); - av_assert0(!ret); - ret = ff_mjpeg_encode_huffman_close(&ac_chrominance_ctx, - m->bits_ac_chrominance, - m->val_ac_chrominance, 256); - av_assert0(!ret); + ff_mjpeg_encode_huffman_close(&dc_luminance_ctx, + m->bits_dc_luminance, + m->val_dc_luminance, 12); + ff_mjpeg_encode_huffman_close(&dc_chrominance_ctx, + m->bits_dc_chrominance, + m->val_dc_chrominance, 12); + ff_mjpeg_encode_huffman_close(&ac_luminance_ctx, + m->bits_ac_luminance, + m->val_ac_luminance, 256); + ff_mjpeg_encode_huffman_close(&ac_chrominance_ctx, + m->bits_ac_chrominance, + m->val_ac_chrominance, 256); ff_mjpeg_build_huffman_codes(m->huff_size_dc_luminance, m->huff_code_dc_luminance, |