simplified

Originally committed as revision 1655 to svn://svn.ffmpeg.org/ffmpeg/trunk

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 */

ffmpeg.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 "framehook.h"
 

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>

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,

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

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);
     }
 }

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;
     }

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)