diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2003-09-11 22:51:05 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2003-09-11 22:51:05 +0000 |
| commit | 7b7d86f1208a25c00e7bb8f136720745a4f80233 (patch) | |
| tree | 971c697e60f2c91db08f884b009af63eade5b307 | |
| parent | d35ff76b794281956cfb75430abee75227fd0378 (diff) | |
| download | ffmpeg-7b7d86f1208a25c00e7bb8f136720745a4f80233.tar.gz | |
simplified version handling
Originally committed as revision 2264 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | VERSION | 1 | ||||
| -rw-r--r-- | common.h | 7 | ||||
| -rw-r--r-- | ffmpeg.c | 1 | ||||
| -rw-r--r-- | ffplay.c | 1 | ||||
| -rw-r--r-- | ffserver.c | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 12 | ||||
| -rw-r--r-- | libavformat/avformat.h | 7 |
7 files changed, 11 insertions, 19 deletions
diff --git a/VERSION b/VERSION deleted file mode 100644 index c650d5af2e..0000000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.4.8
\ No newline at end of file diff --git a/common.h b/common.h deleted file mode 100644 index 102ecae3fa..0000000000 --- a/common.h +++ /dev/null @@ -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 */ @@ -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" @@ -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" diff --git a/ffserver.c b/ffserver.c index 057a386e72..d665f4ef50 100644 --- a/ffserver.c +++ b/ffserver.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 <stdarg.h> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4088c978c0..c193117deb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.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, diff --git a/libavformat/avformat.h b/libavformat/avformat.h index d1d0ba365f..61919e9f3e 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -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> |