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

[Rostislav Pehlivanov]

ffmpeg | branch: release/3.3 | Rostislav Pehlivanov <atomnuker at gmail.com> | Mon Apr  3 21:13:29 2017 +0100| [7034009f625dd042234fe90c2a2a8b8fcf8dcb6c] | committer: Rostislav Pehlivanov

mjpegenc: disable huffman coding with AMV

Isn't supported.

Signed-off-by: Rostislav Pehlivanov <atomnuker at gmail.com>
(cherry picked from commit 7f9b492d544ccef36f1d5d97a76d22502623d3c8)
Signed-off-by: Rostislav Pehlivanov <atomnuker at gmail.com>

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

 libavcodec/mpegvideo_enc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 71a858fc72..882cf09c0a 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -399,6 +399,9 @@ 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);