diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2017-04-03 21:13:29 +0100 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2017-04-09 00:02:46 +0100 |
| commit | 7034009f625dd042234fe90c2a2a8b8fcf8dcb6c (patch) | |
| tree | 8e99ab5470fdbc2193ce340279c03f4909340894 | |
| parent | 6c9574e490218683a302f3814036bf6b9bbc37df (diff) | |
| download | ffmpeg-7034009f625dd042234fe90c2a2a8b8fcf8dcb6c.tar.gz | |
mjpegenc: disable huffman coding with AMV
Isn't supported.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
(cherry picked from commit 7f9b492d544ccef36f1d5d97a76d22502623d3c8)
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 3 |
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); |