[FFmpeg-cvslog] Revert "mjpegenc: disable huffman coding with AMV"

[Michael Niedermayer]

ffmpeg | branch: release/3.3 | Michael Niedermayer <michael at niedermayer.cc> | Sun Apr  9 21:51:33 2017 +0200| [83e6a4a32b75f7160b543d4a54d24b3d02adad8e] | committer: Michael Niedermayer

Revert "mjpegenc: disable huffman coding with AMV"

This was the wrong patch

This reverts commit 7f9b492d544ccef36f1d5d97a76d22502623d3c8.

(cherry picked from commit 724bb805ef8a6de0d9ef27a083ef501bdef2d453)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83e6a4a32b75f7160b543d4a54d24b3d02adad8e
---

 libavcodec/mpegvideo_enc.c | 3 ---
 1 file changed, 3 deletions(-)

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);