diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 2e7a446b4300d17226bfd31dd093001781b6afdc..63a6a1df63d78c5e7592b84265a0188c937cc934 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 0ce3e2b3f34cc8ee80272926c0bb435c97b3fe58..9e02fdca30fdc89178e19e261a4a6812e9b4926d 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 */