diff options
| -rw-r--r-- | libavcodec/dsputil.c | 1 | ||||
| -rw-r--r-- | libavcodec/dsputil.h | 8 | ||||
| -rw-r--r-- | libavcodec/h264.c | 1 | ||||
| -rw-r--r-- | libavcodec/imgconvert.c | 1 | ||||
| -rw-r--r-- | libavcodec/imgconvert.h | 29 | ||||
| -rw-r--r-- | libavcodec/svq3.c | 1 | ||||
| -rw-r--r-- | libavcodec/svq3.h | 27 |
7 files changed, 60 insertions, 8 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index b6a56a2807..5f7d6360c7 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -34,6 +34,7 @@ #include "simple_idct.h" #include "faandct.h" #include "faanidct.h" +#include "imgconvert.h" #include "mathops.h" #include "mpegvideo.h" #include "config.h" diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index a5ace52114..c9418c1b6f 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -53,9 +53,6 @@ void ff_fdct_mmx(int16_t *block); void ff_fdct_mmxext(int16_t *block); void ff_fdct_sse2(int16_t *block); -void ff_svq3_luma_dc_dequant_idct_c(int16_t *output, int16_t *input, int qp); -void ff_svq3_add_idct_c(uint8_t *dst, int16_t *block, int stride, int qp, int dc); - /* encoding scans */ extern const uint8_t ff_alternate_horizontal_scan[64]; extern const uint8_t ff_alternate_vertical_scan[64]; @@ -92,11 +89,6 @@ void ff_avg_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, int stride); void ff_put_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, int stride); void ff_avg_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, int stride); -/* 1/2^n downscaling functions from imgconvert.c */ -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); - void ff_gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy, int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height); diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 22e37c3ba9..28d63d914d 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -42,6 +42,7 @@ #include "golomb.h" #include "mathops.h" #include "rectangle.h" +#include "svq3.h" #include "thread.h" #include "vdpau_internal.h" #include "libavutil/avassert.h" diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 09d24899f1..5c3ec39a1c 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -32,6 +32,7 @@ #include "avcodec.h" #include "dsputil.h" +#include "imgconvert.h" #include "internal.h" #include "libavutil/avassert.h" #include "libavutil/colorspace.h" diff --git a/libavcodec/imgconvert.h b/libavcodec/imgconvert.h new file mode 100644 index 0000000000..df8cee794f --- /dev/null +++ b/libavcodec/imgconvert.h @@ -0,0 +1,29 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg 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, + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_IMGCONVERT_H +#define AVCODEC_IMGCONVERT_H + +#include <stdint.h> + +/* 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 */ diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 05832bfb56..855afab75d 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -57,6 +57,7 @@ #endif #include "svq1.h" +#include "svq3.h" /** * @file diff --git a/libavcodec/svq3.h b/libavcodec/svq3.h new file mode 100644 index 0000000000..7a57d8ad01 --- /dev/null +++ b/libavcodec/svq3.h @@ -0,0 +1,27 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg 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, + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_SVQ3_H +#define AVCODEC_SVQ3_H + +#include <stdint.h> + +void ff_svq3_luma_dc_dequant_idct_c(int16_t *output, int16_t *input, int qp); +void ff_svq3_add_idct_c(uint8_t *dst, int16_t *block, int stride, int qp, int dc); + +#endif /* AVCODEC_DSPUTIL_H */ |