[SCM] libav/experimental: the ongoing struggle for encoding conditionals

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 975af7a99225bdf783d580ff626678177c6ada50
Author: Mike Melanson <mike at multimedia.cx>
Date:   Sun Jun 13 00:10:07 2004 +0000

    the ongoing struggle for encoding conditionals
    
    Originally committed as revision 3220 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/svq1.c b/libavcodec/svq1.c
index 24b852b..25bc44f 100644
--- a/libavcodec/svq1.c
+++ b/libavcodec/svq1.c
@@ -1067,6 +1067,8 @@ static int encode_block(SVQ1Context *s, uint8_t *src, uint8_t *ref, uint8_t *dec
     return best_score;
 }
 
+#ifdef CONFIG_ENCODERS
+
 static void svq1_encode_plane(SVQ1Context *s, int plane, unsigned char *src_plane, unsigned char *ref_plane, unsigned char *decoded_plane,
     int width, int height, int src_stride, int stride)
 {
@@ -1367,6 +1369,8 @@ static int svq1_encode_end(AVCodecContext *avctx)
     return 0;
 }
 
+#endif //CONFIG_ENCODERS
+
 AVCodec svq1_decoder = {
     "svq1",
     CODEC_TYPE_VIDEO,

-- 
Libav/FFmpeg packaging