diff options
| -rw-r--r-- | common.h | 7 | ||||
| -rw-r--r-- | ffmpeg.c | 1 | ||||
| -rw-r--r-- | ffserver.c | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/common.h | 3 | ||||
| -rw-r--r-- | libavcodec/h263.c | 4 | ||||
| -rw-r--r-- | libavcodec/mjpeg.c | 6 | ||||
| -rw-r--r-- | libavformat/http.c | 2 |
8 files changed, 15 insertions, 11 deletions
diff --git a/common.h b/common.h new file mode 100644 index 0000000000..8676ce91e0 --- /dev/null +++ b/common.h @@ -0,0 +1,7 @@ +#ifndef FFMPEG_COMMON_H +#define FFMPEG_COMMON_H + +#define FFMPEG_VERSION_INT 0x000406 +#define FFMPEG_VERSION "0.4.6" + +#endif /* COMMON_H */ @@ -17,6 +17,7 @@ * 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" diff --git a/ffserver.c b/ffserver.c index 76c9bce059..ee560e26bc 100644 --- a/ffserver.c +++ b/ffserver.c @@ -17,6 +17,7 @@ * 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 29507e1ea8..0bae8dab4b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -18,6 +18,8 @@ extern "C" { #define LIBAVCODEC_BUILD 4661 #define LIBAVCODEC_BUILD_STR "4661" +#define LIBAVCODEC_IDENT "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR + enum CodecID { CODEC_ID_NONE, CODEC_ID_MPEG1VIDEO, diff --git a/libavcodec/common.h b/libavcodec/common.h index f7f70e36b3..a1be71b759 100644 --- a/libavcodec/common.h +++ b/libavcodec/common.h @@ -6,9 +6,6 @@ #ifndef COMMON_H #define COMMON_H -#define FFMPEG_VERSION_INT 0x000406 -#define FFMPEG_VERSION "0.4.6" - #if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) # define CONFIG_WIN32 #endif diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 05f4baf286..154a8e9233 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -1667,7 +1667,6 @@ static void mpeg4_encode_visual_object_header(MpegEncContext * s){ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number) { int vo_ver_id; - char buf[255]; if(s->max_b_frames || s->quarter_sample){ vo_ver_id= 5; @@ -1754,8 +1753,7 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n if(!(s->flags & CODEC_FLAG_BITEXACT)){ put_bits(&s->pb, 16, 0); put_bits(&s->pb, 16, 0x1B2); /* user_data */ - sprintf(buf, "FFmpeg%sb%s", FFMPEG_VERSION, LIBAVCODEC_BUILD_STR); - put_string(&s->pb, buf); + put_string(&s->pb, LIBAVCODEC_IDENT); ff_mpeg4_stuffing(&s->pb); } } diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index efc9108b69..d05f4cd72b 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -397,10 +397,8 @@ static void jpeg_put_comments(MpegEncContext *s) flush_put_bits(p); ptr = pbBufPtr(p); put_bits(p, 16, 0); /* patched later */ -#define MJPEG_VERSION "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR - put_string(p, MJPEG_VERSION); - size = strlen(MJPEG_VERSION)+3; -#undef MJPEG_VERSION + put_string(p, LIBAVCODEC_IDENT); + size = strlen(LIBAVCODEC_IDENT)+3; ptr[0] = size >> 8; ptr[1] = size; } diff --git a/libavformat/http.c b/libavformat/http.c index b19c5dbcc2..f81ce1654b 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -191,7 +191,7 @@ static int http_connect(URLContext *h, const char *path, const char *hoststr) "\n", post ? "POST" : "GET", path, - FFMPEG_VERSION, + LIBAVFORMAT_VERSION, hoststr); if (http_write(h, s->buffer, strlen(s->buffer)) < 0) |