| @@ -32,7 +32,6 @@ | |||||
| #include "libavutil/float_dsp.h" | #include "libavutil/float_dsp.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "fft.h" | #include "fft.h" | ||||
| #include "mpeg4audio.h" | #include "mpeg4audio.h" | ||||
| #include "sbr.h" | #include "sbr.h" | ||||
| @@ -83,7 +83,6 @@ | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "fft.h" | #include "fft.h" | ||||
| #include "fmtconvert.h" | #include "fmtconvert.h" | ||||
| #include "lpc.h" | #include "lpc.h" | ||||
| @@ -34,7 +34,6 @@ | |||||
| #include "libavutil/opt.h" | #include "libavutil/opt.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "put_bits.h" | #include "put_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "mpeg4audio.h" | #include "mpeg4audio.h" | ||||
| #include "kbdwin.h" | #include "kbdwin.h" | ||||
| @@ -25,7 +25,6 @@ | |||||
| #include "libavutil/float_dsp.h" | #include "libavutil/float_dsp.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "put_bits.h" | #include "put_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "aac.h" | #include "aac.h" | ||||
| #include "audio_frame_queue.h" | #include "audio_frame_queue.h" | ||||
| @@ -29,7 +29,6 @@ | |||||
| #include <string.h> | #include <string.h> | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "msrledec.h" | #include "msrledec.h" | ||||
| typedef struct AascContext { | typedef struct AascContext { | ||||
| @@ -21,7 +21,6 @@ | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "put_bits.h" | #include "put_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "lpc.h" | #include "lpc.h" | ||||
| #include "mathops.h" | #include "mathops.h" | ||||
| @@ -19,7 +19,6 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "dsputil_alpha.h" | #include "dsputil_alpha.h" | ||||
| #include "asm.h" | #include "asm.h" | ||||
| @@ -20,7 +20,6 @@ | |||||
| */ | */ | ||||
| #include "libavutil/attributes.h" | #include "libavutil/attributes.h" | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "libavcodec/mpegvideo.h" | #include "libavcodec/mpegvideo.h" | ||||
| #include "asm.h" | #include "asm.h" | ||||
| @@ -26,7 +26,6 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "dsputil_alpha.h" | #include "dsputil_alpha.h" | ||||
| #include "asm.h" | #include "asm.h" | ||||
| @@ -21,7 +21,6 @@ | |||||
| #include "libavutil/attributes.h" | #include "libavutil/attributes.h" | ||||
| #include "libavutil/arm/cpu.h" | #include "libavutil/arm/cpu.h" | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "dsputil_arm.h" | #include "dsputil_arm.h" | ||||
| void ff_j_rev_dct_arm(int16_t *data); | void ff_j_rev_dct_arm(int16_t *data); | ||||
| @@ -18,7 +18,6 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "dsputil_arm.h" | #include "dsputil_arm.h" | ||||
| void ff_simple_idct_armv5te(int16_t *data); | void ff_simple_idct_armv5te(int16_t *data); | ||||
| @@ -21,7 +21,6 @@ | |||||
| #include <stdint.h> | #include <stdint.h> | ||||
| #include "libavcodec/avcodec.h" | #include "libavcodec/avcodec.h" | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "dsputil_arm.h" | #include "dsputil_arm.h" | ||||
| void ff_simple_idct_armv6(int16_t *data); | void ff_simple_idct_armv6(int16_t *data); | ||||
| @@ -23,7 +23,6 @@ | |||||
| #include "libavutil/attributes.h" | #include "libavutil/attributes.h" | ||||
| #include "libavcodec/avcodec.h" | #include "libavcodec/avcodec.h" | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "dsputil_arm.h" | #include "dsputil_arm.h" | ||||
| void ff_simple_idct_neon(int16_t *data); | void ff_simple_idct_neon(int16_t *data); | ||||
| @@ -22,7 +22,6 @@ | |||||
| #include "libavutil/attributes.h" | #include "libavutil/attributes.h" | ||||
| #include "libavutil/arm/cpu.h" | #include "libavutil/arm/cpu.h" | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "libavcodec/h264dsp.h" | #include "libavcodec/h264dsp.h" | ||||
| void ff_h264_v_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha, | void ff_h264_v_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha, | ||||
| @@ -20,7 +20,6 @@ | |||||
| #include "libavutil/arm/cpu.h" | #include "libavutil/arm/cpu.h" | ||||
| #include "libavcodec/avcodec.h" | #include "libavcodec/avcodec.h" | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "libavcodec/mpegvideo.h" | #include "libavcodec/mpegvideo.h" | ||||
| #include "mpegvideo_arm.h" | #include "mpegvideo_arm.h" | ||||
| #include "asm-offsets.h" | #include "asm-offsets.h" | ||||
| @@ -21,7 +21,6 @@ | |||||
| #include "libavutil/attributes.h" | #include "libavutil/attributes.h" | ||||
| #include "libavcodec/avcodec.h" | #include "libavcodec/avcodec.h" | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "libavcodec/mpegvideo.h" | #include "libavcodec/mpegvideo.h" | ||||
| #include "mpegvideo_arm.h" | #include "mpegvideo_arm.h" | ||||
| @@ -27,7 +27,6 @@ | |||||
| #include "asv.h" | #include "asv.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| const uint8_t ff_asv_scantab[64] = { | const uint8_t ff_asv_scantab[64] = { | ||||
| 0x00,0x08,0x01,0x09,0x10,0x18,0x11,0x19, | 0x00,0x08,0x01,0x09,0x10,0x18,0x11,0x19, | ||||
| @@ -29,7 +29,6 @@ | |||||
| #include "asv.h" | #include "asv.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "put_bits.h" | #include "put_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "mathops.h" | #include "mathops.h" | ||||
| #include "mpeg12data.h" | #include "mpeg12data.h" | ||||
| @@ -30,7 +30,6 @@ | |||||
| #include <string.h> | #include <string.h> | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "atrac.h" | #include "atrac.h" | ||||
| float ff_atrac_sf_table[64]; | float ff_atrac_sf_table[64]; | ||||
| @@ -35,7 +35,6 @@ | |||||
| #include "libavutil/float_dsp.h" | #include "libavutil/float_dsp.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "fft.h" | #include "fft.h" | ||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "sinewin.h" | #include "sinewin.h" | ||||
| @@ -28,7 +28,7 @@ | |||||
| */ | */ | ||||
| #include "libavutil/common.h" | #include "libavutil/common.h" | ||||
| #include "dsputil.h" | |||||
| #include "avcodec.h" | |||||
| #include "bethsoftvideo.h" | #include "bethsoftvideo.h" | ||||
| #include "bytestream.h" | #include "bytestream.h" | ||||
| @@ -22,7 +22,6 @@ | |||||
| #include "libavutil/attributes.h" | #include "libavutil/attributes.h" | ||||
| #include "libavcodec/avcodec.h" | #include "libavcodec/avcodec.h" | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "libavcodec/mpegvideo.h" | #include "libavcodec/mpegvideo.h" | ||||
| #include "dsputil_bfin.h" | #include "dsputil_bfin.h" | ||||
| @@ -32,7 +32,6 @@ | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #define BITSTREAM_READER_LE | #define BITSTREAM_READER_LE | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "dct.h" | #include "dct.h" | ||||
| #include "rdft.h" | #include "rdft.h" | ||||
| #include "fmtconvert.h" | #include "fmtconvert.h" | ||||
| @@ -27,7 +27,7 @@ | |||||
| #ifndef AVCODEC_BINKDSP_H | #ifndef AVCODEC_BINKDSP_H | ||||
| #define AVCODEC_BINKDSP_H | #define AVCODEC_BINKDSP_H | ||||
| #include "dsputil.h" | |||||
| #include <stdint.h> | |||||
| typedef struct BinkDSPContext { | typedef struct BinkDSPContext { | ||||
| void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/); | void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/); | ||||
| @@ -16,7 +16,6 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #include "dsputil.h" | |||||
| #include "rnd_avg.h" | #include "rnd_avg.h" | ||||
| #ifndef BIT_DEPTH | #ifndef BIT_DEPTH | ||||
| @@ -33,7 +33,6 @@ | |||||
| #include <string.h> | #include <string.h> | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "libavutil/internal.h" | #include "libavutil/internal.h" | ||||
| @@ -41,7 +41,6 @@ | |||||
| #include "libavutil/internal.h" | #include "libavutil/internal.h" | ||||
| #include "libavutil/pixdesc.h" | #include "libavutil/pixdesc.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "put_bits.h" | #include "put_bits.h" | ||||
| @@ -19,7 +19,6 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| /* Parser (mostly) copied from dvdsub.c */ | /* Parser (mostly) copied from dvdsub.c */ | ||||
| @@ -25,7 +25,6 @@ | |||||
| * @author Peter Ross <pross@xvid.org> | * @author Peter Ross <pross@xvid.org> | ||||
| */ | */ | ||||
| #include "dsputil.h" | |||||
| #include "eaidct.h" | #include "eaidct.h" | ||||
| #include "libavutil/common.h" | #include "libavutil/common.h" | ||||
| @@ -30,7 +30,6 @@ | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "aandcttab.h" | #include "aandcttab.h" | ||||
| #include "eaidct.h" | #include "eaidct.h" | ||||
| #include "internal.h" | #include "internal.h" | ||||
| @@ -28,7 +28,6 @@ | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "aandcttab.h" | #include "aandcttab.h" | ||||
| #include "eaidct.h" | #include "eaidct.h" | ||||
| #include "internal.h" | #include "internal.h" | ||||
| @@ -28,7 +28,6 @@ | |||||
| #include <limits.h> | #include <limits.h> | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "error_resilience.h" | #include "error_resilience.h" | ||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "rectangle.h" | #include "rectangle.h" | ||||
| @@ -25,7 +25,6 @@ | |||||
| * @author Michael Niedermayer <michaelni@gmx.at> | * @author Michael Niedermayer <michaelni@gmx.at> | ||||
| */ | */ | ||||
| #include "dsputil.h" | |||||
| #include "faandct.h" | #include "faandct.h" | ||||
| #include "libavutil/internal.h" | #include "libavutil/internal.h" | ||||
| #include "libavutil/libm.h" | #include "libavutil/libm.h" | ||||
| @@ -29,7 +29,6 @@ | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "put_bits.h" | #include "put_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "rangecoder.h" | #include "rangecoder.h" | ||||
| #include "golomb.h" | #include "golomb.h" | ||||
| #include "mathops.h" | #include "mathops.h" | ||||
| @@ -34,7 +34,6 @@ | |||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "put_bits.h" | #include "put_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "rangecoder.h" | #include "rangecoder.h" | ||||
| #include "golomb.h" | #include "golomb.h" | ||||
| #include "mathops.h" | #include "mathops.h" | ||||
| @@ -34,7 +34,6 @@ | |||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "put_bits.h" | #include "put_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "rangecoder.h" | #include "rangecoder.h" | ||||
| #include "golomb.h" | #include "golomb.h" | ||||
| #include "mathops.h" | #include "mathops.h" | ||||
| @@ -25,7 +25,6 @@ | |||||
| * h261codec. | * h261codec. | ||||
| */ | */ | ||||
| #include "dsputil.h" | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "h261.h" | #include "h261.h" | ||||
| @@ -25,7 +25,6 @@ | |||||
| * H.261 decoder. | * H.261 decoder. | ||||
| */ | */ | ||||
| #include "dsputil.h" | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "h263.h" | #include "h263.h" | ||||
| @@ -25,7 +25,6 @@ | |||||
| * H.261 encoder. | * H.261 encoder. | ||||
| */ | */ | ||||
| #include "dsputil.h" | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "h263.h" | #include "h263.h" | ||||
| @@ -30,7 +30,6 @@ | |||||
| //#define DEBUG | //#define DEBUG | ||||
| #include <limits.h> | #include <limits.h> | ||||
| #include "dsputil.h" | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "h263.h" | #include "h263.h" | ||||
| @@ -28,7 +28,6 @@ | |||||
| #include "libavutil/cpu.h" | #include "libavutil/cpu.h" | ||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "h263.h" | #include "h263.h" | ||||
| #include "h263_parser.h" | #include "h263_parser.h" | ||||
| @@ -31,7 +31,6 @@ | |||||
| #include "cabac.h" | #include "cabac.h" | ||||
| #include "cabac_functions.h" | #include "cabac_functions.h" | ||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "dsputil.h" | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "h264.h" | #include "h264.h" | ||||
| #include "h264data.h" | #include "h264data.h" | ||||
| @@ -26,7 +26,6 @@ | |||||
| */ | */ | ||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "dsputil.h" | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "h264.h" | #include "h264.h" | ||||
| @@ -27,7 +27,6 @@ | |||||
| #include "libavutil/imgutils.h" | #include "libavutil/imgutils.h" | ||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "dsputil.h" | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "h264.h" | #include "h264.h" | ||||
| #include "h264data.h" //FIXME FIXME FIXME (just for zigzag_scan) | #include "h264data.h" //FIXME FIXME FIXME (just for zigzag_scan) | ||||
| @@ -26,7 +26,6 @@ | |||||
| */ | */ | ||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "dsputil.h" | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "h264.h" | #include "h264.h" | ||||
| #include "golomb.h" | #include "golomb.h" | ||||
| @@ -25,6 +25,7 @@ | |||||
| * @author Michael Niedermayer <michaelni@gmx.at> | * @author Michael Niedermayer <michaelni@gmx.at> | ||||
| */ | */ | ||||
| #include "dsputil.h" | |||||
| #include "h264pred.h" | #include "h264pred.h" | ||||
| #define BIT_DEPTH 8 | #define BIT_DEPTH 8 | ||||
| @@ -33,7 +33,6 @@ | |||||
| #include "libavutil/mem.h" | #include "libavutil/mem.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "huffyuv.h" | #include "huffyuv.h" | ||||
| int ff_huffyuv_generate_bits_table(uint32_t *dst, const uint8_t *len_table) | int ff_huffyuv_generate_bits_table(uint32_t *dst, const uint8_t *len_table) | ||||
| @@ -29,7 +29,6 @@ | |||||
| */ | */ | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "huffyuv.h" | #include "huffyuv.h" | ||||
| #include "thread.h" | #include "thread.h" | ||||
| @@ -30,7 +30,6 @@ | |||||
| #define BITSTREAM_READER_LE | #define BITSTREAM_READER_LE | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "ivi_dsp.h" | #include "ivi_dsp.h" | ||||
| #include "ivi_common.h" | #include "ivi_common.h" | ||||
| #include "indeo4data.h" | #include "indeo4data.h" | ||||
| @@ -21,7 +21,6 @@ | |||||
| *@brief IntraX8 frame subdecoder image manipulation routines | *@brief IntraX8 frame subdecoder image manipulation routines | ||||
| */ | */ | ||||
| #include "dsputil.h" | |||||
| #include "intrax8dsp.h" | #include "intrax8dsp.h" | ||||
| #include "libavutil/common.h" | #include "libavutil/common.h" | ||||
| @@ -32,7 +32,6 @@ | |||||
| #include "libavutil/internal.h" | #include "libavutil/internal.h" | ||||
| #include "libavutil/mathematics.h" | #include "libavutil/mathematics.h" | ||||
| #include "dsputil.h" | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "h263.h" | #include "h263.h" | ||||
| @@ -30,7 +30,6 @@ | |||||
| //#define DEBUG | //#define DEBUG | ||||
| #include <limits.h> | #include <limits.h> | ||||
| #include "dsputil.h" | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "h263.h" | #include "h263.h" | ||||
| @@ -27,7 +27,6 @@ | |||||
| */ | */ | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "ivi_common.h" | #include "ivi_common.h" | ||||
| #include "ivi_dsp.h" | #include "ivi_dsp.h" | ||||
| @@ -30,7 +30,6 @@ | |||||
| #include "golomb.h" | #include "golomb.h" | ||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "mathops.h" | #include "mathops.h" | ||||
| #include "dsputil.h" | |||||
| #include "mjpeg.h" | #include "mjpeg.h" | ||||
| #include "jpegls.h" | #include "jpegls.h" | ||||
| @@ -29,7 +29,6 @@ | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "libxvid.h" | #include "libxvid.h" | ||||
| //#include "dsputil.h" | |||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #undef NDEBUG | #undef NDEBUG | ||||
| @@ -31,7 +31,6 @@ | |||||
| */ | */ | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "mjpeg.h" | #include "mjpeg.h" | ||||
| @@ -23,7 +23,6 @@ | |||||
| #define AVCODEC_LPC_H | #define AVCODEC_LPC_H | ||||
| #include <stdint.h> | #include <stdint.h> | ||||
| #include "dsputil.h" | |||||
| #define ORDER_METHOD_EST 0 | #define ORDER_METHOD_EST 0 | ||||
| #define ORDER_METHOD_2LEVEL 1 | #define ORDER_METHOD_2LEVEL 1 | ||||
| @@ -28,7 +28,6 @@ | |||||
| */ | */ | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "mpeg12.h" | #include "mpeg12.h" | ||||
| #include "thread.h" | #include "thread.h" | ||||
| @@ -36,7 +36,6 @@ | |||||
| #include "libavutil/imgutils.h" | #include "libavutil/imgutils.h" | ||||
| #include "libavutil/opt.h" | #include "libavutil/opt.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "mjpeg.h" | #include "mjpeg.h" | ||||
| #include "mjpegdec.h" | #include "mjpegdec.h" | ||||
| @@ -34,7 +34,6 @@ | |||||
| #include <assert.h> | #include <assert.h> | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "mjpeg.h" | #include "mjpeg.h" | ||||
| #include "mjpegenc.h" | #include "mjpegenc.h" | ||||
| @@ -32,7 +32,6 @@ | |||||
| #include <limits.h> | #include <limits.h> | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "mathops.h" | #include "mathops.h" | ||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| @@ -28,7 +28,6 @@ | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "mpegaudiodsp.h" | #include "mpegaudiodsp.h" | ||||
| #include "mpegaudio.h" | #include "mpegaudio.h" | ||||
| @@ -26,7 +26,6 @@ | |||||
| */ | */ | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "mathops.h" | #include "mathops.h" | ||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| @@ -32,7 +32,6 @@ | |||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "mathops.h" | #include "mathops.h" | ||||
| #include "mpegaudiodsp.h" | #include "mpegaudiodsp.h" | ||||
| #include "dsputil.h" | |||||
| /* | /* | ||||
| * TODO: | * TODO: | ||||
| @@ -23,7 +23,6 @@ | |||||
| #include <X11/extensions/XvMC.h> | #include <X11/extensions/XvMC.h> | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #undef NDEBUG | #undef NDEBUG | ||||
| @@ -33,7 +33,6 @@ | |||||
| #include <string.h> | #include <string.h> | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "msrledec.h" | #include "msrledec.h" | ||||
| typedef struct MsrleContext { | typedef struct MsrleContext { | ||||
| @@ -26,7 +26,7 @@ | |||||
| #ifndef AVCODEC_MSS2DSP_H | #ifndef AVCODEC_MSS2DSP_H | ||||
| #define AVCODEC_MSS2DSP_H | #define AVCODEC_MSS2DSP_H | ||||
| #include "dsputil.h" | |||||
| #include <stdint.h> | |||||
| typedef struct MSS2DSPContext { | typedef struct MSS2DSPContext { | ||||
| void (*mss2_blit_wmv9)(uint8_t *dst, int dst_stride, | void (*mss2_blit_wmv9)(uint8_t *dst, int dst_stride, | ||||
| @@ -33,7 +33,6 @@ | |||||
| #include "nellymoser.h" | #include "nellymoser.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #define BITSTREAM_READER_LE | #define BITSTREAM_READER_LE | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| @@ -36,7 +36,6 @@ | |||||
| #include "libavutil/lfg.h" | #include "libavutil/lfg.h" | ||||
| #include "libavutil/random_seed.h" | #include "libavutil/random_seed.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "fft.h" | #include "fft.h" | ||||
| #include "fmtconvert.h" | #include "fmtconvert.h" | ||||
| #include "internal.h" | #include "internal.h" | ||||
| @@ -40,7 +40,6 @@ | |||||
| #include "nellymoser.h" | #include "nellymoser.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "audio_frame_queue.h" | #include "audio_frame_queue.h" | ||||
| #include "dsputil.h" | |||||
| #include "fft.h" | #include "fft.h" | ||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "sinewin.h" | #include "sinewin.h" | ||||
| @@ -27,7 +27,6 @@ | |||||
| #include "libavutil/lzo.h" | #include "libavutil/lzo.h" | ||||
| #include "libavutil/imgutils.h" | #include "libavutil/imgutils.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "rtjpeg.h" | #include "rtjpeg.h" | ||||
| typedef struct { | typedef struct { | ||||
| @@ -25,7 +25,6 @@ | |||||
| #include "libavutil/attributes.h" | #include "libavutil/attributes.h" | ||||
| #include "libavutil/cpu.h" | #include "libavutil/cpu.h" | ||||
| #include "libavutil/mem.h" | #include "libavutil/mem.h" | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "dsputil_altivec.h" | #include "dsputil_altivec.h" | ||||
| /* ***** WARNING ***** WARNING ***** WARNING ***** */ | /* ***** WARNING ***** WARNING ***** WARNING ***** */ | ||||
| @@ -23,7 +23,6 @@ | |||||
| #include <altivec.h> | #include <altivec.h> | ||||
| #endif | #endif | ||||
| #include "libavutil/common.h" | #include "libavutil/common.h" | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "dsputil_altivec.h" | #include "dsputil_altivec.h" | ||||
| #define vs16(v) ((vector signed short)(v)) | #define vs16(v) ((vector signed short)(v)) | ||||
| @@ -23,7 +23,6 @@ | |||||
| #include "libavutil/mem.h" | #include "libavutil/mem.h" | ||||
| #include "libavutil/ppc/types_altivec.h" | #include "libavutil/ppc/types_altivec.h" | ||||
| #include "libavutil/ppc/util_altivec.h" | #include "libavutil/ppc/util_altivec.h" | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "dsputil_altivec.h" | #include "dsputil_altivec.h" | ||||
| /* | /* | ||||
| @@ -42,7 +42,6 @@ | |||||
| #include <altivec.h> | #include <altivec.h> | ||||
| #endif | #endif | ||||
| #include "libavutil/ppc/types_altivec.h" | #include "libavutil/ppc/types_altivec.h" | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "dsputil_altivec.h" | #include "dsputil_altivec.h" | ||||
| #define IDCT_HALF \ | #define IDCT_HALF \ | ||||
| @@ -28,7 +28,6 @@ | |||||
| #include "libavutil/cpu.h" | #include "libavutil/cpu.h" | ||||
| #include "libavutil/ppc/types_altivec.h" | #include "libavutil/ppc/types_altivec.h" | ||||
| #include "libavutil/ppc/util_altivec.h" | #include "libavutil/ppc/util_altivec.h" | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "libavcodec/mpegvideo.h" | #include "libavcodec/mpegvideo.h" | ||||
| #include "dsputil_altivec.h" | #include "dsputil_altivec.h" | ||||
| @@ -22,7 +22,6 @@ | |||||
| #include "libavutil/attributes.h" | #include "libavutil/attributes.h" | ||||
| #include "libavutil/ppc/types_altivec.h" | #include "libavutil/ppc/types_altivec.h" | ||||
| #include "libavutil/ppc/util_altivec.h" | #include "libavutil/ppc/util_altivec.h" | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "libavcodec/vc1dsp.h" | #include "libavcodec/vc1dsp.h" | ||||
| // main steps of 8x8 transform | // main steps of 8x8 transform | ||||
| @@ -29,7 +29,6 @@ | |||||
| #include "libavutil/ppc/types_altivec.h" | #include "libavutil/ppc/types_altivec.h" | ||||
| #include "libavutil/ppc/util_altivec.h" | #include "libavutil/ppc/util_altivec.h" | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "dsputil_altivec.h" | #include "dsputil_altivec.h" | ||||
| static const vec_s16 constants = | static const vec_s16 constants = | ||||
| @@ -39,7 +39,6 @@ | |||||
| #include "libavutil/channel_layout.h" | #include "libavutil/channel_layout.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "rdft.h" | #include "rdft.h" | ||||
| #include "mpegaudiodsp.h" | #include "mpegaudiodsp.h" | ||||
| @@ -23,7 +23,6 @@ | |||||
| #define AVCODEC_RA288_H | #define AVCODEC_RA288_H | ||||
| #include <stdint.h> | #include <stdint.h> | ||||
| #include "dsputil.h" | |||||
| #include "libavutil/common.h" | #include "libavutil/common.h" | ||||
| static const float amptable[8]={ | static const float amptable[8]={ | ||||
| @@ -26,7 +26,6 @@ | |||||
| */ | */ | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "ratecontrol.h" | #include "ratecontrol.h" | ||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "libavutil/eval.h" | #include "libavutil/eval.h" | ||||
| @@ -31,7 +31,6 @@ | |||||
| #include <assert.h> | #include <assert.h> | ||||
| #include "config.h" | #include "config.h" | ||||
| #include "libavutil/common.h" | #include "libavutil/common.h" | ||||
| #include "dsputil.h" | |||||
| /** | /** | ||||
| * fill a rectangle. | * fill a rectangle. | ||||
| @@ -26,7 +26,6 @@ | |||||
| */ | */ | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "libavutil/common.h" | #include "libavutil/common.h" | ||||
| #if FF_API_AVCODEC_RESAMPLE | #if FF_API_AVCODEC_RESAMPLE | ||||
| @@ -25,7 +25,6 @@ | |||||
| #include "libavutil/lfg.h" | #include "libavutil/lfg.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "bytestream.h" | #include "bytestream.h" | ||||
| #include "dsputil.h" | |||||
| typedef struct roq_cell { | typedef struct roq_cell { | ||||
| unsigned char y[4]; | unsigned char y[4]; | ||||
| @@ -20,7 +20,6 @@ | |||||
| */ | */ | ||||
| #include "libavutil/common.h" | #include "libavutil/common.h" | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "rtjpeg.h" | #include "rtjpeg.h" | ||||
| #define PUT_COEFF(c) \ | #define PUT_COEFF(c) \ | ||||
| @@ -27,7 +27,6 @@ | |||||
| #include "libavutil/imgutils.h" | #include "libavutil/imgutils.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "mpeg4video.h" | #include "mpeg4video.h" | ||||
| #include "h263.h" | #include "h263.h" | ||||
| @@ -25,7 +25,6 @@ | |||||
| */ | */ | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "golomb.h" | #include "golomb.h" | ||||
| @@ -25,7 +25,6 @@ | |||||
| */ | */ | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "h264chroma.h" | #include "h264chroma.h" | ||||
| #include "h264qpel.h" | #include "h264qpel.h" | ||||
| #include "rv34dsp.h" | #include "rv34dsp.h" | ||||
| @@ -28,7 +28,6 @@ | |||||
| #define AVCODEC_RV34_H | #define AVCODEC_RV34_H | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "h264pred.h" | #include "h264pred.h" | ||||
| @@ -27,7 +27,6 @@ | |||||
| #include "libavutil/imgutils.h" | #include "libavutil/imgutils.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "golomb.h" | #include "golomb.h" | ||||
| @@ -20,7 +20,6 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "dsputil_sh4.h" | #include "dsputil_sh4.h" | ||||
| #include "sh4.h" | #include "sh4.h" | ||||
| @@ -25,7 +25,6 @@ | |||||
| #define AVCODEC_SIPR_H | #define AVCODEC_SIPR_H | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "acelp_pitch_delay.h" | #include "acelp_pitch_delay.h" | ||||
| #include "libavutil/mem.h" | #include "libavutil/mem.h" | ||||
| @@ -24,7 +24,6 @@ | |||||
| #include <stdint.h> | #include <stdint.h> | ||||
| #include "libavcodec/dsputil.h" | |||||
| #include "dsputil_vis.h" | #include "dsputil_vis.h" | ||||
| #include "libavutil/mem.h" | #include "libavutil/mem.h" | ||||
| @@ -27,7 +27,6 @@ | |||||
| */ | */ | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "h263.h" | #include "h263.h" | ||||
| #include "internal.h" | #include "internal.h" | ||||
| @@ -40,7 +40,6 @@ | |||||
| * http://samples.libav.org/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov | * http://samples.libav.org/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov | ||||
| */ | */ | ||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "dsputil.h" | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "h264.h" | #include "h264.h" | ||||
| @@ -34,9 +34,9 @@ | |||||
| #include <string.h> | #include <string.h> | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "dsputil.h" | |||||
| #include "libavutil/imgutils.h" | #include "libavutil/imgutils.h" | ||||
| #include "libavutil/internal.h" | #include "libavutil/internal.h" | ||||
| #include "libavutil/intreadwrite.h" | |||||
| #include "libavutil/mem.h" | #include "libavutil/mem.h" | ||||
| #include "truemotion1data.h" | #include "truemotion1data.h" | ||||
| @@ -23,7 +23,6 @@ | |||||
| #include "libavutil/float_dsp.h" | #include "libavutil/float_dsp.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "dsputil.h" | |||||
| #include "fft.h" | #include "fft.h" | ||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "lsp.h" | #include "lsp.h" | ||||
| @@ -21,7 +21,6 @@ | |||||
| */ | */ | ||||
| #include "vaapi_internal.h" | #include "vaapi_internal.h" | ||||
| #include "dsputil.h" | |||||
| /** Reconstruct bitstream f_code */ | /** Reconstruct bitstream f_code */ | ||||
| static inline int mpeg2_get_f_code(MpegEncContext *s) | static inline int mpeg2_get_f_code(MpegEncContext *s) | ||||
| @@ -28,7 +28,6 @@ | |||||
| */ | */ | ||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "dsputil.h" | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "vc1.h" | #include "vc1.h" | ||||
| @@ -27,7 +27,6 @@ | |||||
| */ | */ | ||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "dsputil.h" | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "mpegvideo.h" | #include "mpegvideo.h" | ||||
| #include "h263.h" | #include "h263.h" | ||||