From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 2 Aug 2013 10:23:47 +0000 (+0200)
Subject: Merge commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=da4cd615023365f1af8056cbb50ac96c91af07a1;p=ffmpeg

Merge commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c'

* commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c':
  h264_sei: Remove pointless old comment
  twinvq: Add proper twinvq prefixes to identifiers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

da4cd615023365f1af8056cbb50ac96c91af07a1
diff --cc libavcodec/h264_sei.c
index 999fce7b349,c88f2030966..2af9079f37c
--- a/libavcodec/h264_sei.c
+++ b/libavcodec/h264_sei.c
@@@ -149,11 -106,9 +149,11 @@@ static int decode_unregistered_user_dat
      }
  
      user_data[i]= 0;
-     e= sscanf(user_data+16, "x264 - core %d"/*%s - H.264/MPEG-4 AVC codec - Copyleft 2005 - http://www.videolan.org/x264.html*/, &build);
+     e = sscanf(user_data + 16, "x264 - core %d", &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(h->avctx->debug & FF_DEBUG_BUGS)
          av_log(h->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data+16);