diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-11-01 18:12:53 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-11-01 18:12:53 +0000 |
| commit | ad86ea038a0b4803c7e3f1a82a293e2ee538e345 (patch) | |
| tree | 24aa3f8a8900028189d268d75854049dfa386794 /src/libffmpeg/libavcodec/mpeg12.c | |
| parent | 72ae3e51758986775949a7ba2002a526d359389f (diff) | |
| download | xine-lib-ad86ea038a0b4803c7e3f1a82a293e2ee538e345.tar.gz xine-lib-ad86ea038a0b4803c7e3f1a82a293e2ee538e345.tar.bz2 | |
big ffmpeg patch
* do not define CONFIG_ENCODERS any more, use a stripped down XINE_MPEG_ENCODER,
which will only compile an I-frame-only MPEG1 encoder (speeds up compile time)
* fix a lot of warnings in ffmpeg (a good deal of which have already been
submitted to the ffmpeg project by Mike)
* simplify some Makefiles
CVS patchset: 5667
CVS date: 2003/11/01 18:12:53
Diffstat (limited to 'src/libffmpeg/libavcodec/mpeg12.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/mpeg12.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libffmpeg/libavcodec/mpeg12.c b/src/libffmpeg/libavcodec/mpeg12.c index cd3a725ae..7cf6a21df 100644 --- a/src/libffmpeg/libavcodec/mpeg12.c +++ b/src/libffmpeg/libavcodec/mpeg12.c @@ -48,7 +48,7 @@ #define MB_BTYPE_VLC_BITS 6 #define TEX_VLC_BITS 9 -#ifdef CONFIG_ENCODERS +#if defined(CONFIG_ENCODERS) || defined(XINE_MPEG_ENCODER) static void mpeg1_encode_block(MpegEncContext *s, DCTELEM *block, int component); @@ -74,7 +74,7 @@ extern int XVMC_field_start(MpegEncContext *s, AVCodecContext *avctx); extern int XVMC_field_end(MpegEncContext *s); #endif -#ifdef CONFIG_ENCODERS +#if defined(CONFIG_ENCODERS) || defined(XINE_MPEG_ENCODER) static uint8_t (*mv_penalty)[MAX_MV*2+1]= NULL; static uint8_t fcode_tab[MAX_MV*2+1]; @@ -128,7 +128,7 @@ static void init_2d_vlc_rl(RLTable *rl) } } -#ifdef CONFIG_ENCODERS +#if defined(CONFIG_ENCODERS) || defined(XINE_MPEG_ENCODER) static void init_uni_ac_vlc(RLTable *rl, uint32_t *uni_ac_vlc_bits, uint8_t *uni_ac_vlc_len){ int i; @@ -383,7 +383,7 @@ void ff_mpeg1_clean_buffers(MpegEncContext *s){ memset(s->last_mv, 0, sizeof(s->last_mv)); } -#ifdef CONFIG_ENCODERS +#if defined(CONFIG_ENCODERS) || defined(XINE_MPEG_ENCODER) void ff_mpeg1_encode_slice_header(MpegEncContext *s){ put_header(s, SLICE_MIN_START_CODE + s->mb_y); |