virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-09-16 08:36:51 +02:00
Code Issues Releases Activity

simplified

Browse Source 
Originally committed as revision 1655 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Beregszaszi
2003-03-09 16:07:19 +00:00
parent 7b3da20487
commit ce2749d2c4
8 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common.h Normal file
View File

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

1
ffmpeg.c
View File

@@ -17,6 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#define HAVE_AV_CONFIG_H #define HAVE_AV_CONFIG_H
#include "common.h"
#include "avformat.h" #include "avformat.h"
#include "framehook.h" #include "framehook.h"

1
ffserver.c
View File

@@ -17,6 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#define HAVE_AV_CONFIG_H #define HAVE_AV_CONFIG_H
#include "common.h"
#include "avformat.h" #include "avformat.h"
#include <stdarg.h> #include <stdarg.h>

2
libavcodec/avcodec.h
View File

@@ -18,6 +18,8 @@ extern "C" {
#define LIBAVCODEC_BUILD 4661 #define LIBAVCODEC_BUILD 4661
#define LIBAVCODEC_BUILD_STR "4661" #define LIBAVCODEC_BUILD_STR "4661"
#define LIBAVCODEC_IDENT "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR
enum CodecID { enum CodecID {
CODEC_ID_NONE, CODEC_ID_NONE,
CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG1VIDEO,

3
libavcodec/common.h
View File

@@ -6,9 +6,6 @@
#ifndef COMMON_H #ifndef COMMON_H
#define COMMON_H #define COMMON_H
#define FFMPEG_VERSION_INT 0x000406
#define FFMPEG_VERSION "0.4.6"
#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) #if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
# define CONFIG_WIN32 # define CONFIG_WIN32
#endif #endif

4
libavcodec/h263.c
View File

@@ -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) static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number)
{ {
int vo_ver_id; int vo_ver_id;
char buf[255];
if(s->max_b_frames || s->quarter_sample){ if(s->max_b_frames || s->quarter_sample){
vo_ver_id= 5; 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)){ if(!(s->flags & CODEC_FLAG_BITEXACT)){
put_bits(&s->pb, 16, 0); put_bits(&s->pb, 16, 0);
put_bits(&s->pb, 16, 0x1B2); /* user_data */ put_bits(&s->pb, 16, 0x1B2); /* user_data */
sprintf(buf, "FFmpeg%sb%s", FFMPEG_VERSION, LIBAVCODEC_BUILD_STR); put_string(&s->pb, LIBAVCODEC_IDENT);
put_string(&s->pb, buf);
ff_mpeg4_stuffing(&s->pb); ff_mpeg4_stuffing(&s->pb);
} }
} }

6
libavcodec/mjpeg.c
View File

@@ -397,10 +397,8 @@ static void jpeg_put_comments(MpegEncContext *s)
flush_put_bits(p); flush_put_bits(p);
ptr = pbBufPtr(p); ptr = pbBufPtr(p);
put_bits(p, 16, 0); /* patched later */ put_bits(p, 16, 0); /* patched later */
#define MJPEG_VERSION "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR put_string(p, LIBAVCODEC_IDENT);
put_string(p, MJPEG_VERSION); size = strlen(LIBAVCODEC_IDENT)+3;
size = strlen(MJPEG_VERSION)+3;
#undef MJPEG_VERSION
ptr[0] = size >> 8; ptr[0] = size >> 8;
ptr[1] = size; ptr[1] = size;
} }

2
libavformat/http.c
View File

@@ -191,7 +191,7 @@ static int http_connect(URLContext *h, const char *path, const char *hoststr)
"\n", "\n",
post ? "POST" : "GET", post ? "POST" : "GET",
path, path,
FFMPEG_VERSION, LIBAVFORMAT_VERSION,
hoststr); hoststr);
if (http_write(h, s->buffer, strlen(s->buffer)) < 0) if (http_write(h, s->buffer, strlen(s->buffer)) < 0)