diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2006-06-24 20:09:49 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2006-06-24 20:09:49 +0000 |
| commit | 24e1591036e7aabe6ec1f5c88785499ac77e4962 (patch) | |
| tree | f49dec4ff4832ae09ac61961aafdd842eed6c2d3 | |
| parent | 0aec3c5cbf3e7b744dfcef8ee2b5766bba5f9003 (diff) | |
| download | ffmpeg-24e1591036e7aabe6ec1f5c88785499ac77e4962.tar.gz | |
minor cleanup
Originally committed as revision 5518 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavformat/avformat.h | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b2bfa23656..d4072d9521 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 c94a9b1190..24fb082186 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 */ |