[FFmpeg-cvslog] avcodec/libx264: set supported pix_fmts at runtime rather than build time

[James Almer]

ffmpeg | branch: release/3.4 | James Almer <jamrial at gmail.com> | Tue Dec 26 19:40:27 2017 -0300| [d8104977bbfaa91743bf983ff620f75f8c7684bc] | committer: James Almer

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 at gmail.com>
(cherry picked from commit 7e60c74329353db28db00552028bc88cd2a52346)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8104977bbfaa91743bf983ff620f75f8c7684bc
---

 libavcodec/libx264.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 59cc0ab4a8..6b05846365 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -911,14 +911,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)