Mercurial > libavcodec.hg
changeset 2814:48fb350b0ec9 libavcodec
A.B.C versions
author | michael |
---|---|
date | Sun, 31 Jul 2005 10:51:04 +0000 |
parents | 6fd9dbb8c385 |
children | 636133fccbdc |
files | avcodec.h h263.c |
diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/avcodec.h Sun Jul 31 10:00:25 2005 +0000 +++ b/avcodec.h Sun Jul 31 10:51:04 2005 +0000 @@ -15,17 +15,18 @@ #include "rational.h" #include <sys/types.h> /* size_t */ +//FIXME the following 2 really dont belong in here #define FFMPEG_VERSION_INT 0x000409 #define FFMPEG_VERSION "CVS" -#define LIBAVCODEC_BUILD 4759 - - -#define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT -#define LIBAVCODEC_VERSION FFMPEG_VERSION #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define LIBAVCODEC_IDENT "FFmpeg" LIBAVCODEC_VERSION "b" AV_STRINGIFY(LIBAVCODEC_BUILD) + +#define LIBAVCODEC_VERSION_INT ((49<<16)+(0<<8)+0) +#define LIBAVCODEC_VERSION 49.0.0 +#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT + +#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) #define AV_NOPTS_VALUE int64_t_C(0x8000000000000000) #define AV_TIME_BASE 1000000
--- a/h263.c Sun Jul 31 10:00:25 2005 +0000 +++ b/h263.c Sun Jul 31 10:51:04 2005 +0000 @@ -5767,6 +5767,10 @@ if(e!=4) e=sscanf(buf, "FFmpeg v%d.%d.%d / libavcodec build: %d", &ver, &ver2, &ver3, &build); if(e!=4){ + e=sscanf(buf, "Lavc%d.%d.%d", &ver, &ver2, &ver3)+1; + build= (ver<<16) + (ver2<<8) + ver3; + } + if(e!=4){ if(strcmp(buf, "ffmpeg")==0){ s->lavc_build= 4600; }