[FFmpeg-cvslog] h264: fix x264 build detection

Michael Niedermayer git at videolan.org
Mon Aug 13 05:04:27 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 13 04:58:15 2012 +0200| [e9d0ab5717a4aa7e9d52affaa8d8d76cb3e600e0] | committer: Michael Niedermayer

h264: fix x264 build detection

Fixes Ticket1503

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/h264_sei.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
index 0d0d88e..81edeb2 100644
--- a/libavcodec/h264_sei.c
+++ b/libavcodec/h264_sei.c
@@ -111,6 +111,8 @@ static int decode_unregistered_user_data(H264Context *h, int size){
     e= sscanf(user_data+16, "x264 - core %d"/*%s - H.264/MPEG-4 AVC codec - Copyleft 2005 - http://www.videolan.org/x264.html*/, &build);
     if(e==1 && build>0)
         h->x264_build= build;
+    if(e==1 && build==1 && !strncmp(user_data+16, "x264 - core 0000", 16))
+        h->x264_build = 67;
 
     if(s->avctx->debug & FF_DEBUG_BUGS)
         av_log(s->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data+16);



More information about the ffmpeg-cvslog mailing list