diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-04-09 21:51:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-04-11 23:39:21 +0200 |
| commit | 83e6a4a32b75f7160b543d4a54d24b3d02adad8e (patch) | |
| tree | fc09e9435b87c27507116540e012086759d4ee10 | |
| parent | 7182fbc47182c613331b254cc57f5ae9a41c8269 (diff) | |
| download | ffmpeg-83e6a4a32b75f7160b543d4a54d24b3d02adad8e.tar.gz | |
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@niedermayer.cc>
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 3 |
1 files changed, 0 insertions, 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); |