mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 12:09:55 +00:00
A.B.C versions
Originally committed as revision 4486 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
e53222d19b
commit
5aa083eec1
@ -15,17 +15,18 @@ extern "C" {
|
||||
#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
|
||||
|
@ -5766,6 +5766,10 @@ static int decode_user_data(MpegEncContext *s, GetBitContext *gb){
|
||||
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){
|
||||
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;
|
||||
|
@ -5,11 +5,11 @@
|
||||
extern "C" {
|
||||
#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_VERSION FFMPEG_VERSION
|
||||
#define LIBAVFORMAT_IDENT "FFmpeg" FFMPEG_VERSION "b" AV_STRINGIFY(LIBAVFORMAT_BUILD)
|
||||
#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
|
||||
|
||||
#include <time.h>
|
||||
#include <stdio.h> /* FILE */
|
||||
|
Loading…
Reference in New Issue
Block a user