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/common.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/common.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/common.c b/src/libffmpeg/libavcodec/common.c index f37c2c9eb..673ce7083 100644 --- a/src/libffmpeg/libavcodec/common.c +++ b/src/libffmpeg/libavcodec/common.c @@ -60,7 +60,7 @@ void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_size) #endif } -#ifdef CONFIG_ENCODERS +#if defined(CONFIG_ENCODERS) || defined(XINE_MPEG_ENCODER) /* return the number of bits output */ int64_t get_bit_count(PutBitContext *s) @@ -101,7 +101,7 @@ void flush_put_bits(PutBitContext *s) #endif } -#ifdef CONFIG_ENCODERS +#if defined(CONFIG_ENCODERS) || defined(XINE_MPEG_ENCODER) void put_string(PutBitContext * pbc, char *s) { |