Mercurial > libavcodec.hg
changeset 1118:8248e652d64e libavcodec
simplified
| author | al3x |
|---|---|
| date | Sun, 09 Mar 2003 16:07:19 +0000 |
| parents | 4046cbf85762 |
| children | 547a503247e8 |
| files | avcodec.h common.h h263.c mjpeg.c |
| diffstat | 4 files changed, 5 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/avcodec.h Sat Mar 08 23:43:34 2003 +0000 +++ b/avcodec.h Sun Mar 09 16:07:19 2003 +0000 @@ -18,6 +18,8 @@ #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,
--- a/common.h Sat Mar 08 23:43:34 2003 +0000 +++ b/common.h Sun Mar 09 16:07:19 2003 +0000 @@ -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
--- a/h263.c Sat Mar 08 23:43:34 2003 +0000 +++ b/h263.c Sun Mar 09 16:07:19 2003 +0000 @@ -1667,7 +1667,6 @@ 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 @@ 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); } }
--- a/mjpeg.c Sat Mar 08 23:43:34 2003 +0000 +++ b/mjpeg.c Sun Mar 09 16:07:19 2003 +0000 @@ -397,10 +397,8 @@ 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; }