summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorRostislav Pehlivanov <atomnuker@gmail.com>2017-04-03 21:13:29 +0100
committerRostislav Pehlivanov <atomnuker@gmail.com>2017-04-09 00:00:32 +0100
commit7f9b492d544ccef36f1d5d97a76d22502623d3c8 (patch)
tree10caa747573983fc87800ef2e8336231d53d2ca8 /libavcodec
parent2c9be3882a03823413945bd9e2d9af33e6e322d5 (diff)
mjpegenc: disable huffman coding with AMV
Isn't supported. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpegvideo_enc.c3
1 files changed, 3 insertions, 0 deletions
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);