diff options
| author | James Almer <jamrial@gmail.com> | 2017-12-26 19:40:27 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-12-26 19:41:04 -0300 |
| commit | 7e60c74329353db28db00552028bc88cd2a52346 (patch) | |
| tree | 634047cf4fb6a9fd142bb0e93e2b0ccb0e119e9f /libavcodec/libx264.c | |
| parent | e6a1dfc9ce81a443b16776a5fbd841284efa3613 (diff) | |
| download | ffmpeg-7e60c74329353db28db00552028bc88cd2a52346.tar.gz | |
avcodec/libx264: set supported pix_fmts at runtime rather than build time
This partially reverts a change in behavior introduced in 2a111c99a60fdf4fe5eea2b073901630190c6c93.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 754383e080..0e714f1615 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -895,14 +895,16 @@ static const enum AVPixelFormat pix_fmts_8bit_rgb[] = { static av_cold void X264_init_static(AVCodec *codec) { - if (X264_BIT_DEPTH == 8) +#if X264_BUILD < 153 + if (x264_bit_depth == 8) codec->pix_fmts = pix_fmts_8bit; - else if (X264_BIT_DEPTH == 9) + else if (x264_bit_depth == 9) codec->pix_fmts = pix_fmts_9bit; - else if (X264_BIT_DEPTH == 10) + else if (x264_bit_depth == 10) codec->pix_fmts = pix_fmts_10bit; - else /* X264_BIT_DEPTH == 0 */ - codec->pix_fmts = pix_fmts; +#else + codec->pix_fmts = pix_fmts; +#endif } #define OFFSET(x) offsetof(X264Context, x) |