virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

A.B.C versions

Browse Source 
Originally committed as revision 4486 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-07-31 10:51:04 +00:00
parent e53222d19b
commit 5aa083eec1
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/avcodec.h
View File

@ -15,17 +15,18 @@ extern "C" {
#include "rational.h" #include "rational.h"
#include <sys/types.h> /* size_t */ #include <sys/types.h> /* size_t */
//FIXME the following 2 really dont belong in here
#define FFMPEG_VERSION_INT 0x000409 #define FFMPEG_VERSION_INT 0x000409
#define FFMPEG_VERSION "CVS" #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_STRINGIFY(s) AV_TOSTRING(s)
#define AV_TOSTRING(s) #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_NOPTS_VALUE int64_t_C(0x8000000000000000)
#define AV_TIME_BASE 1000000 #define AV_TIME_BASE 1000000

4
libavcodec/h263.c
View File

@ -5766,6 +5766,10 @@ static int decode_user_data(MpegEncContext *s, GetBitContext *gb){
e=sscanf(buf, "FFmpe%*[^b]b%d", &build)+3; e=sscanf(buf, "FFmpe%*[^b]b%d", &build)+3;
if(e!=4) if(e!=4)
e=sscanf(buf, "FFmpeg v%d.%d.%d / libavcodec build: %d", &ver, &ver2, &ver3, &build); 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(e!=4){
if(strcmp(buf, "ffmpeg")==0){ if(strcmp(buf, "ffmpeg")==0){
s->lavc_build= 4600; s->lavc_build= 4600;

8
libavformat/avformat.h
View File

@ -5,11 +5,11 @@
extern "C" { extern "C" {
#endif #endif
#define LIBAVFORMAT_BUILD 4629 #define LIBAVFORMAT_VERSION_INT ((49<<16)+(0<<8)+0)
#define LIBAVFORMAT_VERSION 49.0.0
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
#define LIBAVFORMAT_VERSION_INT FFMPEG_VERSION_INT #define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
#define LIBAVFORMAT_VERSION FFMPEG_VERSION
#define LIBAVFORMAT_IDENT "FFmpeg" FFMPEG_VERSION "b" AV_STRINGIFY(LIBAVFORMAT_BUILD)
#include <time.h> #include <time.h>
#include <stdio.h> /* FILE */ #include <stdio.h> /* FILE */