On 09.04.2017 22:38, Michael Niedermayer wrote:
ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Sun
Apr 9 21:51:33 2017 +0200| [724bb805ef8a6de0d9ef27a083ef501bdef2d453] | committer:
Michael Niedermayer
Revert "mjpegenc: disable huffman coding with AMV"
This was the wrong patch
This reverts commit 7f9b492d544ccef36f1d5d97a76d22502623d3c8.
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=724bb805ef8a6de0d9ef27a083ef501bdef2d453
---
libavcodec/mpegvideo_enc.c | 3 ---
1 file changed, 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);
The wrong patch was also committed to the release/3.3 branch. Also there
is an open suggestion to the updated patch in
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209802.html
Regards,
Tobias
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
