diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-07-24 09:28:24 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-07-24 09:28:24 +0000 |
| commit | 91d44ffc9a77a976fd926c87f91e8e40b899c4dd (patch) | |
| tree | 421d1913ed2472e3ce87ddd2ad66fad9cd103dab | |
| parent | 760fb54f7c31c04c01dd3cb2638380db249bf1fb (diff) | |
| download | ffmpeg-91d44ffc9a77a976fd926c87f91e8e40b899c4dd.tar.gz | |
fix user data parsing code so it suppors pre1 and cvs
Originally committed as revision 4471 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h263.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
2 files changed, 1 insertions, 4 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; } diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 0ce3e2b3f3..9e02fdca30 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -609,7 +609,6 @@ typedef struct MpegEncContext { int xvid_build; /* lavc specific stuff, used to workaround bugs in libavcodec */ - int ffmpeg_version; int lavc_build; /* RV10 specific */ |