Merge commit '7ebfb466aec2c4628fcd42a72b29034efcaba4bc'

[ffmpeg] / libavcodec / imgconvert.h

diff --git a/libavcodec/imgconvert.h b/libavcodec/imgconvert.h
index 64da317d27644cfef4d57f09c3f0a640aa1a0d39..df8cee794fc2e9a6d37506a279c55436adec107f 100644 (file)
--- a/libavcodec/imgconvert.h
+++ b/libavcodec/imgconvert.h
@@ -1,9 +1,4 @@
 /*
- * Misc image conversion routines
- * most functionality is exported to the public API, see avcodec.h
- *
- * Copyright (c) 2008 Vitor Sessak
- *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
@@ -25,20 +20,10 @@
 #define AVCODEC_IMGCONVERT_H
 
 #include <stdint.h>
-#include "avcodec.h"
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-attribute_deprecated
-int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width);
-
-attribute_deprecated
-int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt, int height);
-
-attribute_deprecated
-int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane);
 
-attribute_deprecated
-int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt);
-#endif
+/* 1/2^n downscaling functions */
+void ff_shrink22(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
+void ff_shrink44(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
+void ff_shrink88(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
 
 #endif /* AVCODEC_IMGCONVERT_H */