summaryrefslogtreecommitdiff
path: root/libavcodec/h263.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2005-07-24 09:28:24 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-07-24 09:28:24 +0000
commit91d44ffc9a77a976fd926c87f91e8e40b899c4dd (patch)
tree421d1913ed2472e3ce87ddd2ad66fad9cd103dab /libavcodec/h263.c
parent760fb54f7c31c04c01dd3cb2638380db249bf1fb (diff)
fix user data parsing code so it suppors pre1 and cvs
Originally committed as revision 4471 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263.c')
-rw-r--r--libavcodec/h263.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 2e7a446b43..63a6a1df63 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -5759,17 +5759,15 @@ static int decode_user_data(MpegEncContext *s, GetBitContext *gb){
}
/* ffmpeg detection */
- e=sscanf(buf, "FFmpeg%d.%d.%db%d", &ver, &ver2, &ver3, &build);
+ e=sscanf(buf, "FFmpe%*[^b]b%d", &build)+3;
if(e!=4)
e=sscanf(buf, "FFmpeg v%d.%d.%d / libavcodec build: %d", &ver, &ver2, &ver3, &build);
if(e!=4){
if(strcmp(buf, "ffmpeg")==0){
- s->ffmpeg_version= 0x000406;
s->lavc_build= 4600;
}
}
if(e==4){
- s->ffmpeg_version= ver*256*256 + ver2*256 + ver3;
s->lavc_build= build;
}