# HG changeset patch
# User michael
# Date 1122197304 0
# Node ID 55a6659fc2ee3fb07e18d949263ccb4b9dae605c
# Parent  dc616c8ef3e624efc7a86489c41b53f3ae25d1b5
fix user data parsing code so it suppors pre1 and cvs

diff -r dc616c8ef3e6 -r 55a6659fc2ee h263.c
--- a/h263.c	Sat Jul 23 11:16:18 2005 +0000
+++ b/h263.c	Sun Jul 24 09:28:24 2005 +0000
@@ -5759,17 +5759,15 @@
     }
     
     /* 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;
     }
     
diff -r dc616c8ef3e6 -r 55a6659fc2ee mpegvideo.h
--- a/mpegvideo.h	Sat Jul 23 11:16:18 2005 +0000
+++ b/mpegvideo.h	Sun Jul 24 09:28:24 2005 +0000
@@ -609,7 +609,6 @@
     int xvid_build;
     
     /* lavc specific stuff, used to workaround bugs in libavcodec */
-    int ffmpeg_version;
     int lavc_build;
     
     /* RV10 specific */