[SCM] libav/experimental: minor cleanup

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 24e1591036e7aabe6ec1f5c88785499ac77e4962
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Sat Jun 24 20:09:49 2006 +0000

    minor cleanup
    
    Originally committed as revision 5518 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index b2bfa23..d4072d9 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -280,9 +280,6 @@ typedef struct RcOverride{
     float quality_factor;
 } RcOverride;
 
-/* only for ME compatiblity with old apps */
-extern int motion_estimation_method;
-
 #define FF_MAX_B_FRAMES 16
 
 /* encoding support
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index c94a9b1..24fb082 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -394,7 +394,7 @@ int av_read_image(ByteIOContext *pb, const char *filename,
 int av_write_image(ByteIOContext *pb, AVImageFormat *fmt, AVImageInfo *img);
 
 extern AVImageFormat *first_image_format;
-
+#if 0
 extern AVImageFormat pnm_image_format;
 extern AVImageFormat pbm_image_format;
 extern AVImageFormat pgm_image_format;
@@ -406,8 +406,9 @@ extern AVImageFormat yuv_image_format;
 extern AVImageFormat png_image_format;
 #endif
 extern AVImageFormat jpeg_image_format;
+#endif
 extern AVImageFormat gif_image_format;
-extern AVImageFormat sgi_image_format;
+//extern AVImageFormat sgi_image_format; //broken in itself
 
 /* XXX: use automatic init with either ELF sections or C file parser */
 /* modules */

-- 
Libav/FFmpeg packaging