mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-09 14:14:39 +02:00
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>
This commit is contained in:
parent
7182fbc471
commit
83e6a4a32b
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user