diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-16 23:03:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-16 23:03:10 +0200 |
| commit | 87da1188981fbfa802d1ccfe22bf32cc76f52ada (patch) | |
| tree | e10bed6922a70c8ae682558a811e3553b1e39cbd /libavcodec/ffv1enc.c | |
| parent | ae0192ef5fe8ca67b6532a57f829f744db3facb9 (diff) | |
avcodec/ffv1enc: Factor rice high depth check out
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/ffv1enc.c')
| -rw-r--r-- | libavcodec/ffv1enc.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index d4f0577ab9..0a72591396 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -598,11 +598,6 @@ FF_ENABLE_DEPRECATION_WARNINGS av_log(avctx, AV_LOG_ERROR, "bits_per_raw_sample invalid\n"); return AVERROR_INVALIDDATA; } - if (s->ac == AC_GOLOMB_RICE) { - av_log(avctx, AV_LOG_INFO, - "bits_per_raw_sample > 8, forcing range coder\n"); - s->ac = AC_RANGE_CUSTOM_TAB; - } s->version = FFMAX(s->version, 1); case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_YA8: @@ -661,11 +656,6 @@ FF_ENABLE_DEPRECATION_WARNINGS } } s->version = FFMAX(s->version, 1); - if (s->ac == AC_GOLOMB_RICE) { - av_log(avctx, AV_LOG_INFO, - "bits_per_raw_sample > 8, forcing coder 1\n"); - s->ac = AC_RANGE_CUSTOM_TAB; - } break; default: av_log(avctx, AV_LOG_ERROR, "format not supported\n"); @@ -673,6 +663,13 @@ FF_ENABLE_DEPRECATION_WARNINGS } av_assert0(s->bits_per_raw_sample >= 8); + if (s->bits_per_raw_sample > 8) { + if (s->ac == AC_GOLOMB_RICE) { + av_log(avctx, AV_LOG_INFO, + "bits_per_raw_sample > 8, forcing range coder\n"); + s->ac = AC_RANGE_CUSTOM_TAB; + } + } if (s->transparency) { av_log(avctx, AV_LOG_WARNING, "Storing alpha plane, this will require a recent FFV1 decoder to playback!\n"); } |