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

1 files changed, 8 insertions, 0 deletions

diff --git a/src/libffmpeg/libavcodec/asv1.c b/src/libffmpeg/libavcodec/asv1.c
index 2e6f785fb..bff0fe37a 100644
--- a/src/libffmpeg/libavcodec/asv1.c
+++ b/src/libffmpeg/libavcodec/asv1.c
@@ -481,6 +481,8 @@ for(i=0; i<s->avctx->extradata_size; i++){
     return (get_bits_count(&a->gb)+31)/32*4;
 }
 
+#ifdef CONFIG_ENCODERS
+
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
     ASV1Context * const a = avctx->priv_data;
     AVFrame *pict = data;
@@ -535,6 +537,8 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
     return size*4;
 }
 
+#endif
+
 static void common_init(AVCodecContext *avctx){
     ASV1Context * const a = avctx->priv_data;
 
@@ -582,6 +586,8 @@ static int decode_init(AVCodecContext *avctx){
     return 0;
 }
 
+#ifdef CONFIG_ENCODERS
+
 static int encode_init(AVCodecContext *avctx){
     ASV1Context * const a = avctx->priv_data;
     int i;
@@ -606,6 +612,8 @@ static int encode_init(AVCodecContext *avctx){
     return 0;
 }
 
+#endif
+
 static int decode_end(AVCodecContext *avctx){
     ASV1Context * const a = avctx->priv_data;