[FFmpeg-devel] [PATCH]Continue supporting one year old x264 intallations

[Carl Eugen Hoyos]

Hi!

I have absolutely no problem with the trivial alternative (somebody 
has to commit it though) since I usually don't compile with x264 
support, but I fear it will make users unhappy.

x264 version 142 was committed January 21st:
git.videolan.org/?p=x264.git;a=commitdiff;h=dd6a3034

Please comment, Carl Eugen
-------------- next part --------------
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 7839248..5952a0d 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -533,7 +533,12 @@ static av_cold int X264_init(AVCodecContext *avctx)
         x4->params.b_vfr_input = 0;
     }
     if (x4->avcintra_class >= 0)
+#if X264_BUILD >= 142
         x4->params.i_avcintra_class = x4->avcintra_class;
+#else
+        av_log(avctx, AV_LOG_ERROR,
+               "x264 too old for AVC Intra, at least version 142 needed\n");
+#endif
     if (x4->b_bias != INT_MIN)
         x4->params.i_bframe_bias              = x4->b_bias;
     if (x4->b_pyramid >= 0)