lavc: remove disabled FF_API_OLD_DECODE_AUDIO cruft

[ffmpeg] / libavcodec / imgconvert.h

diff --git a/libavcodec/imgconvert.h b/libavcodec/imgconvert.h
index 83bce68f56dd501b65235b831f3303a2fd1c296b..91e9f912445f540d9adee82ca513a15242529bd1 100644 (file)
--- a/libavcodec/imgconvert.h
+++ b/libavcodec/imgconvert.h
@@ -1,23 +1,18 @@
 /*
- * Misc image conversion routines
- * most functionality is exported to the public API, see avcodec.h
+ * This file is part of Libav.
  *
- * Copyright (c) 2008 Vitor Sessak
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -25,15 +20,10 @@
 #define AVCODEC_IMGCONVERT_H
 
 #include <stdint.h>
-#include "avcodec.h"
-
-int ff_fill_linesize(AVPicture *picture, int pix_fmt, int width);
-
-int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, int pix_fmt, int height);
-
-int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane);
 
-int img_convert(AVPicture *dst, int dst_pix_fmt, const AVPicture *src,
-                int src_pix_fmt, int src_width, int src_height);
+/* 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 */