Skip to content

F
ffmpeg
Commit 724bb805 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Revert "mjpegenc: disable huffman coding with AMV" 

This was the wrong patch

This reverts commit 7f9b492d.
parent d8e5a481
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
libavcodec/mpegvideo_enc.c
View file @ 724bb805
...@@ -399,9 +399,6 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -399,9 +399,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
return AVERROR(EINVAL); 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)) { 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"); av_log(avctx, AV_LOG_ERROR, "intra dc precision too large\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment