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/utils.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/utils.c')
-rw-r--r-- | src/libffmpeg/libavcodec/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libffmpeg/libavcodec/utils.c b/src/libffmpeg/libavcodec/utils.c index ace54ef11..2334de8e6 100644 --- a/src/libffmpeg/libavcodec/utils.c +++ b/src/libffmpeg/libavcodec/utils.c @@ -129,7 +129,7 @@ typedef struct InternalBuffer{ #define ALIGN(x, a) (((x)+(a)-1)&~((a)-1)) -void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){ +static void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){ int w_align= 1; int h_align= 1; @@ -283,7 +283,7 @@ void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic){ //printf("R%X\n", pic->opaque); } -enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, enum PixelFormat * fmt){ +static enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, enum PixelFormat * fmt){ return fmt[0]; } @@ -491,7 +491,7 @@ AVCodec *avcodec_find_decoder_by_name(const char *name) return NULL; } -AVCodec *avcodec_find(enum CodecID id) +static AVCodec *avcodec_find(enum CodecID id) { AVCodec *p; p = first_avcodec; |