From 724bb805ef8a6de0d9ef27a083ef501bdef2d453 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 9 Apr 2017 21:51:33 +0200 Subject: Revert "mjpegenc: disable huffman coding with AMV" This was the wrong patch This reverts commit 7f9b492d544ccef36f1d5d97a76d22502623d3c8. --- libavcodec/mpegvideo_enc.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'libavcodec/mpegvideo_enc.c') diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 882cf09c0a..71a858fc72 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -399,9 +399,6 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(EINVAL); } - if (s->huffman && avctx->codec_id == AV_CODEC_ID_AMV) - s->huffman = 0; - if (s->intra_dc_precision > (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO ? 3 : 0)) { av_log(avctx, AV_LOG_ERROR, "intra dc precision too large\n"); return AVERROR(EINVAL); -- cgit v1.2.3