diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-02 12:23:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-02 12:23:52 +0200 |
| commit | da4cd615023365f1af8056cbb50ac96c91af07a1 (patch) | |
| tree | 63d8efac65c4454e62241f8c8659f4282200e066 /libavcodec/h264_sei.c | |
| parent | 67291ffd6390be85962dd440e1a73c32e5e5ba78 (diff) | |
| parent | 4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c (diff) | |
| download | ffmpeg-da4cd615023365f1af8056cbb50ac96c91af07a1.tar.gz | |
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>
Diffstat (limited to 'libavcodec/h264_sei.c')
| -rw-r--r-- | libavcodec/h264_sei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 999fce7b34..2af9079f37 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -149,7 +149,7 @@ static int decode_unregistered_user_data(H264Context *h, int size){ } 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)) |