diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-09 21:11:51 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-10 00:12:01 +0100 |
commit | e10bd12c250afb89046c4b0ee3f30d6d23eb8127 (patch) | |
tree | 6489220d70860be89e28dd2bb362c845ea2ab4c1 /libavcodec/mjpegenc_common.c | |
parent | 53234b9ba5e6ebe23060c83d8fee2e03d9cb3e17 (diff) | |
download | ffmpeg-e10bd12c250afb89046c4b0ee3f30d6d23eb8127.tar.gz |
avcodec/mjpegenc: Remove non functional huffman reallocation and error handling
If this is wanted iam not against it but it must be designed to work with all cases
like slice threads, and a single growing buffer does not work very well with slices.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mjpegenc_common.c')
-rw-r--r-- | libavcodec/mjpegenc_common.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index 2a53cbf13f..e53a45ca4d 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -497,9 +497,6 @@ int ff_mjpeg_encode_stuffing(MpegEncContext *s) m = s->mjpeg_ctx; - if (m->error) - return m->error; - if (s->huffman == HUFFMAN_TABLE_OPTIMAL) { ff_mjpeg_build_optimal_huffman(m); @@ -516,10 +513,6 @@ int ff_mjpeg_encode_stuffing(MpegEncContext *s) ff_mjpeg_encode_picture_header(s->avctx, &s->pb, &s->intra_scantable, s->pred, s->intra_matrix, s->chroma_intra_matrix); ff_mjpeg_encode_picture_frame(s); - if (m->error < 0) { - ret = m->error; - return ret; - } ret = ff_mpv_reallocate_putbitbuffer(s, put_bits_count(&s->pb) / 8 + 100, put_bits_count(&s->pb) / 4 + 1000); |