simplified version handling
Originally committed as revision 2264 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
d35ff76b79
commit
7b7d86f120
1
VERSION
1
VERSION
@ -1 +0,0 @@
|
||||
0.4.8
|
7
common.h
7
common.h
@ -1,7 +0,0 @@
|
||||
#ifndef FFMPEG_COMMON_H
|
||||
#define FFMPEG_COMMON_H
|
||||
|
||||
#define FFMPEG_VERSION_INT 0x000408
|
||||
#define FFMPEG_VERSION "0.4.8"
|
||||
|
||||
#endif /* COMMON_H */
|
1
ffmpeg.c
1
ffmpeg.c
@ -17,7 +17,6 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#define HAVE_AV_CONFIG_H
|
||||
#include "common.h"
|
||||
#include "avformat.h"
|
||||
#include "framehook.h"
|
||||
|
||||
|
1
ffplay.c
1
ffplay.c
@ -17,7 +17,6 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#define HAVE_AV_CONFIG_H
|
||||
#include "common.h"
|
||||
#include "avformat.h"
|
||||
|
||||
#include "cmdutils.h"
|
||||
|
@ -17,7 +17,6 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#define HAVE_AV_CONFIG_H
|
||||
#include "common.h"
|
||||
#include "avformat.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
|
@ -13,12 +13,16 @@ extern "C" {
|
||||
|
||||
#include "common.h"
|
||||
|
||||
#define LIBAVCODEC_VERSION_INT 0x000408
|
||||
#define LIBAVCODEC_VERSION "0.4.8"
|
||||
#define FFMPEG_VERSION_INT 0x000408
|
||||
#define FFMPEG_VERSION "0.4.8"
|
||||
#define LIBAVCODEC_BUILD 4679
|
||||
#define LIBAVCODEC_BUILD_STR "4679"
|
||||
|
||||
#define LIBAVCODEC_IDENT "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR
|
||||
#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)
|
||||
|
||||
enum CodecID {
|
||||
CODEC_ID_NONE,
|
||||
|
@ -5,12 +5,11 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define LIBAVFORMAT_VERSION_INT 0x000408
|
||||
#define LIBAVFORMAT_VERSION "0.4.8"
|
||||
#define LIBAVFORMAT_BUILD 4608
|
||||
#define LIBAVFORMAT_BUILD_STR "4608"
|
||||
|
||||
#define LIBAVFORMAT_IDENT "FFmpeg" LIBAVFORMAT_VERSION "b" LIBAVFORMAT_BUILD_STR
|
||||
#define LIBAVFORMAT_VERSION_INT FFMPEG_VERSION_INT
|
||||
#define LIBAVFORMAT_VERSION FFMPEG_VERSION
|
||||
#define LIBAVFORMAT_IDENT "FFmpeg" FFMPEG_VERSION "b" AV_STRINGIFY(LIBAVFORMAT_BUILD)
|
||||
|
||||
#include <time.h>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user