Browse Source

Revert "mjpegenc: disable huffman coding with AMV"

This was the wrong patch

This reverts commit 7f9b492d54.

(cherry picked from commit 724bb805ef)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.3
Michael Niedermayer 8 years ago
parent
commit
83e6a4a32b
1 changed files with 0 additions and 3 deletions
  1. +0
    -3
      libavcodec/mpegvideo_enc.c

+ 0
- 3
libavcodec/mpegvideo_enc.c View File

@@ -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);


Loading…
Cancel
Save