diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-04-09 21:51:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-04-09 21:53:30 +0200 |
| commit | 724bb805ef8a6de0d9ef27a083ef501bdef2d453 (patch) | |
| tree | 055fc0aba6c06f19eb44b459961bec9cdc5fab72 | |
| parent | d8e5a4818b19fec90a696190f94d0667914715a3 (diff) | |
| download | ffmpeg-724bb805ef8a6de0d9ef27a083ef501bdef2d453.tar.gz | |
Revert "mjpegenc: disable huffman coding with AMV"
This was the wrong patch
This reverts commit 7f9b492d544ccef36f1d5d97a76d22502623d3c8.
| -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); |