That is a more appropriate place for it.
Unified · Split
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | #include <stdint.h> | 25 | #include <stdint.h> |
| 26 | #include "libavutil/common.h" | 26 | #include "libavutil/common.h" |
| 27 | #include "libavutil/mathematics.h" | 27 | #include "libavutil/mathematics.h" |
| 28 | #include "libavutil/mem_internal.h" | ||
| 28 | #include "avcodec.h" | 29 | #include "avcodec.h" |
| 29 | #include "aacps.h" | 30 | #include "aacps.h" |
| 30 | #if USE_FIXED | 31 | #if USE_FIXED |
| @@ -38,6 +38,7 @@ · 37 unmodified lines | |||
| 38 | #include "libavutil/internal.h" | 38 | #include "libavutil/internal.h" |
| 39 | #include "libavutil/libm.h" | 39 | #include "libavutil/libm.h" |
| 40 | #include "libavutil/avassert.h" | 40 | #include "libavutil/avassert.h" |
| 41 | #include "libavutil/mem_internal.h" | ||
| 41 | 42 | ||
| 42 | #include <stdint.h> | 43 | #include <stdint.h> |
| 43 | #include <float.h> | 44 | #include <float.h> |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | #include "libavutil/attributes.h" | 23 | #include "libavutil/attributes.h" |
| 24 | #include "libavutil/internal.h" | 24 | #include "libavutil/internal.h" |
| 25 | #include "libavutil/mem_internal.h" | ||
| 25 | #include "libavutil/aarch64/cpu.h" | 26 | #include "libavutil/aarch64/cpu.h" |
| 26 | #include "vp9dsp_init.h" | 27 | #include "vp9dsp_init.h" |
| 27 | 28 | ||
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | #include "libavutil/attributes.h" | 23 | #include "libavutil/attributes.h" |
| 24 | #include "libavutil/internal.h" | 24 | #include "libavutil/internal.h" |
| 25 | #include "libavutil/mem_internal.h" | ||
| 25 | #include "libavutil/aarch64/cpu.h" | 26 | #include "libavutil/aarch64/cpu.h" |
| 26 | #include "libavcodec/vp9dsp.h" | 27 | #include "libavcodec/vp9dsp.h" |
| 27 | #include "vp9dsp_init.h" | 28 | #include "vp9dsp_init.h" |
| @@ -34,6 +34,7 @@ · 33 unmodified lines | |||
| 34 | #include "libavutil/channel_layout.h" | 34 | #include "libavutil/channel_layout.h" |
| 35 | #include "libavutil/crc.h" | 35 | #include "libavutil/crc.h" |
| 36 | #include "libavutil/internal.h" | 36 | #include "libavutil/internal.h" |
| 37 | #include "libavutil/mem_internal.h" | ||
| 37 | #include "libavutil/opt.h" | 38 | #include "libavutil/opt.h" |
| 38 | #include "avcodec.h" | 39 | #include "avcodec.h" |
| 39 | #include "internal.h" | 40 | #include "internal.h" |
| @@ -30,6 +30,7 @@ · 29 unmodified lines | |||
| 30 | 30 | ||
| 31 | #include "libavutil/attributes.h" | 31 | #include "libavutil/attributes.h" |
| 32 | #include "libavutil/internal.h" | 32 | #include "libavutil/internal.h" |
| 33 | #include "libavutil/mem_internal.h" | ||
| 33 | 34 | ||
| 34 | #include "audiodsp.h" | 35 | #include "audiodsp.h" |
| 35 | #include "internal.h" | 36 | #include "internal.h" |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | #include "libavutil/attributes.h" | 23 | #include "libavutil/attributes.h" |
| 24 | #include "libavutil/internal.h" | 24 | #include "libavutil/internal.h" |
| 25 | #include "libavutil/mem_internal.h" | ||
| 25 | #include "libavutil/arm/cpu.h" | 26 | #include "libavutil/arm/cpu.h" |
| 26 | #include "vp9dsp_init.h" | 27 | #include "vp9dsp_init.h" |
| 27 | 28 | ||
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | #include "libavutil/attributes.h" | 23 | #include "libavutil/attributes.h" |
| 24 | #include "libavutil/internal.h" | 24 | #include "libavutil/internal.h" |
| 25 | #include "libavutil/mem_internal.h" | ||
| 25 | #include "libavutil/arm/cpu.h" | 26 | #include "libavutil/arm/cpu.h" |
| 26 | #include "libavcodec/vp9dsp.h" | 27 | #include "libavcodec/vp9dsp.h" |
| 27 | #include "vp9dsp_init.h" | 28 | #include "vp9dsp_init.h" |
| @@ -29,6 +29,8 @@ · 28 unmodified lines | |||
| 29 | 29 | ||
| 30 | #include "libavutil/float_dsp.h" | 30 | #include "libavutil/float_dsp.h" |
| 31 | #include "libavutil/libm.h" | 31 | #include "libavutil/libm.h" |
| 32 | #include "libavutil/mem_internal.h" | ||
| 33 | |||
| 32 | #include "avcodec.h" | 34 | #include "avcodec.h" |
| 33 | #include "sinewin.h" | 35 | #include "sinewin.h" |
| 34 | #include "fft.h" | 36 | #include "fft.h" |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include "libavutil/attributes.h" | 23 | #include "libavutil/attributes.h" |
| 24 | #include "libavutil/imgutils.h" | 24 | #include "libavutil/imgutils.h" |
| 25 | #include "libavutil/internal.h" | 25 | #include "libavutil/internal.h" |
| 26 | #include "libavutil/mem_internal.h" | ||
| 26 | 27 | ||
| 27 | #define BITSTREAM_READER_LE | 28 | #define BITSTREAM_READER_LE |
| 28 | #include "avcodec.h" | 29 | #include "avcodec.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | #define BITSTREAM_READER_LE | 21 | #define BITSTREAM_READER_LE |
| 22 | 22 | ||
| 23 | #include "libavutil/channel_layout.h" | 23 | #include "libavutil/channel_layout.h" |
| 24 | #include "libavutil/mem_internal.h" | ||
| 24 | 25 | ||
| 25 | #include "dcadec.h" | 26 | #include "dcadec.h" |
| 26 | #include "dcadata.h" | 27 | #include "dcadata.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/mem.h" | 21 | #include "libavutil/mem.h" |
| 22 | #include "libavutil/mem_internal.h" | ||
| 22 | 23 | ||
| 23 | #include "dcadsp.h" | 24 | #include "dcadsp.h" |
| 24 | #include "dcamath.h" | 25 | #include "dcamath.h" |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | #include "libavutil/channel_layout.h" | 28 | #include "libavutil/channel_layout.h" |
| 29 | #include "libavutil/common.h" | 29 | #include "libavutil/common.h" |
| 30 | #include "libavutil/ffmath.h" | 30 | #include "libavutil/ffmath.h" |
| 31 | #include "libavutil/mem_internal.h" | ||
| 31 | #include "libavutil/opt.h" | 32 | #include "libavutil/opt.h" |
| 32 | #include "avcodec.h" | 33 | #include "avcodec.h" |
| 33 | #include "dca.h" | 34 | #include "dca.h" |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | #include "libavutil/attributes.h" | 26 | #include "libavutil/attributes.h" |
| 27 | #include "libavutil/internal.h" | 27 | #include "libavutil/internal.h" |
| 28 | #include "libavutil/mem_internal.h" | ||
| 28 | #include "libavutil/opt.h" | 29 | #include "libavutil/opt.h" |
| 29 | 30 | ||
| 30 | #include "avcodec.h" | 31 | #include "avcodec.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | #include "libavutil/float_dsp.h" | 21 | #include "libavutil/float_dsp.h" |
| 22 | #include "libavutil/thread.h" | 22 | #include "libavutil/thread.h" |
| 23 | #include "libavutil/mem.h" | 23 | #include "libavutil/mem.h" |
| 24 | #include "libavutil/mem_internal.h" | ||
| 24 | 25 | ||
| 25 | #include "internal.h" | 26 | #include "internal.h" |
| 26 | #include "get_bits.h" | 27 | #include "get_bits.h" |
| @@ -38,6 +38,7 @@ · 37 unmodified lines | |||
| 38 | #include "libavutil/avassert.h" | 38 | #include "libavutil/avassert.h" |
| 39 | #include "libavutil/imgutils.h" | 39 | #include "libavutil/imgutils.h" |
| 40 | #include "libavutil/internal.h" | 40 | #include "libavutil/internal.h" |
| 41 | #include "libavutil/mem_internal.h" | ||
| 41 | #include "libavutil/pixdesc.h" | 42 | #include "libavutil/pixdesc.h" |
| 42 | 43 | ||
| 43 | #include "avcodec.h" | 44 | #include "avcodec.h" |
| @@ -30,6 +30,7 @@ · 29 unmodified lines | |||
| 30 | 30 | ||
| 31 | #include "libavutil/attributes.h" | 31 | #include "libavutil/attributes.h" |
| 32 | #include "libavutil/internal.h" | 32 | #include "libavutil/internal.h" |
| 33 | #include "libavutil/mem_internal.h" | ||
| 33 | #include "libavutil/opt.h" | 34 | #include "libavutil/opt.h" |
| 34 | #include "libavutil/pixdesc.h" | 35 | #include "libavutil/pixdesc.h" |
| 35 | 36 | ||
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | 27 | ||
| 28 | #include "libavutil/internal.h" | 28 | #include "libavutil/internal.h" |
| 29 | #include "libavutil/intreadwrite.h" | 29 | #include "libavutil/intreadwrite.h" |
| 30 | #include "libavutil/mem_internal.h" | ||
| 30 | #include "internal.h" | 31 | #include "internal.h" |
| 31 | #include "avcodec.h" | 32 | #include "avcodec.h" |
| 32 | #include "h264dec.h" | 33 | #include "h264dec.h" |
| @@ -38,7 +38,9 @@ · 37 unmodified lines | |||
| 38 | #include "libavutil/ffmath.h" | 38 | #include "libavutil/ffmath.h" |
| 39 | #include "libavutil/float_dsp.h" | 39 | #include "libavutil/float_dsp.h" |
| 40 | #include "libavutil/internal.h" | 40 | #include "libavutil/internal.h" |
| 41 | #include "libavutil/mem_internal.h" | ||
| 41 | #include "libavutil/thread.h" | 42 | #include "libavutil/thread.h" |
| 43 | |||
| 42 | #include "avcodec.h" | 44 | #include "avcodec.h" |
| 43 | #include "bswapdsp.h" | 45 | #include "bswapdsp.h" |
| 44 | #include "get_bits.h" | 46 | #include "get_bits.h" |
| @@ -34,6 +34,7 @@ · 33 unmodified lines | |||
| 34 | #include "libavutil/imgutils.h" | 34 | #include "libavutil/imgutils.h" |
| 35 | #include "libavutil/internal.h" | 35 | #include "libavutil/internal.h" |
| 36 | #include "libavutil/mathematics.h" | 36 | #include "libavutil/mathematics.h" |
| 37 | #include "libavutil/mem_internal.h" | ||
| 37 | #include "avcodec.h" | 38 | #include "avcodec.h" |
| 38 | #include "mpegvideo.h" | 39 | #include "mpegvideo.h" |
| 39 | #include "h263.h" | 40 | #include "h263.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include "libavutil/common.h" | 22 | #include "libavutil/common.h" |
| 23 | #include "libavutil/lls.h" | 23 | #include "libavutil/lls.h" |
| 24 | #include "libavutil/mem_internal.h" | ||
| 24 | 25 | ||
| 25 | #define LPC_USE_DOUBLE | 26 | #define LPC_USE_DOUBLE |
| 26 | #include "lpc.h" | 27 | #include "lpc.h" |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | #include "libavutil/attributes.h" | 23 | #include "libavutil/attributes.h" |
| 24 | #include "libavutil/internal.h" | 24 | #include "libavutil/internal.h" |
| 25 | #include "libavutil/mem_internal.h" | ||
| 25 | #include "avcodec.h" | 26 | #include "avcodec.h" |
| 26 | #include "copy_block.h" | 27 | #include "copy_block.h" |
| 27 | #include "simple_idct.h" | 28 | #include "simple_idct.h" |
| @@ -53,6 +53,7 @@ · 52 unmodified lines | |||
| 53 | 53 | ||
| 54 | #include "libavcodec/aac.h" | 54 | #include "libavcodec/aac.h" |
| 55 | #include "libavcodec/aacsbr.h" | 55 | #include "libavcodec/aacsbr.h" |
| 56 | #include "libavutil/mem_internal.h" | ||
| 56 | #include "libavutil/mips/asmdefs.h" | 57 | #include "libavutil/mips/asmdefs.h" |
| 57 | 58 | ||
| 58 | #define ENVELOPE_ADJUSTMENT_OFFSET 2 | 59 | #define ENVELOPE_ADJUSTMENT_OFFSET 2 |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | #include "constants.h" | 25 | #include "constants.h" |
| 26 | #include "vc1dsp_mips.h" | 26 | #include "vc1dsp_mips.h" |
| 27 | #include "hpeldsp_mips.h" | 27 | #include "hpeldsp_mips.h" |
| 28 | #include "libavutil/mem_internal.h" | ||
| 28 | #include "libavutil/mips/mmiutils.h" | 29 | #include "libavutil/mips/mmiutils.h" |
| 29 | 30 | ||
| 30 | #define VC1_INV_TRANCS_8_TYPE1(o1, o2, r1, r2, r3, r4, c0) \ | 31 | #define VC1_INV_TRANCS_8_TYPE1(o1, o2, r1, r2, r3, r4, c0) \ |
| @@ -28,7 +28,9 @@ · 27 unmodified lines | |||
| 28 | #include "libavutil/channel_layout.h" | 28 | #include "libavutil/channel_layout.h" |
| 29 | #include "libavutil/internal.h" | 29 | #include "libavutil/internal.h" |
| 30 | #include "libavutil/lfg.h" | 30 | #include "libavutil/lfg.h" |
| 31 | #include "libavutil/mem_internal.h" | ||
| 31 | #include "libavutil/thread.h" | 32 | #include "libavutil/thread.h" |
| 33 | |||
| 32 | #include "avcodec.h" | 34 | #include "avcodec.h" |
| 33 | #include "get_bits.h" | 35 | #include "get_bits.h" |
| 34 | #include "internal.h" | 36 | #include "internal.h" |
| @@ -36,6 +36,7 @@ · 35 unmodified lines | |||
| 36 | #include "libavutil/internal.h" | 36 | #include "libavutil/internal.h" |
| 37 | #include "libavutil/intmath.h" | 37 | #include "libavutil/intmath.h" |
| 38 | #include "libavutil/mathematics.h" | 38 | #include "libavutil/mathematics.h" |
| 39 | #include "libavutil/mem_internal.h" | ||
| 39 | #include "libavutil/pixdesc.h" | 40 | #include "libavutil/pixdesc.h" |
| 40 | #include "libavutil/opt.h" | 41 | #include "libavutil/opt.h" |
| 41 | #include "avcodec.h" | 42 | #include "avcodec.h" |
| @@ -25,6 +25,8 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | #include "libavutil/avassert.h" | 26 | #include "libavutil/avassert.h" |
| 27 | #include "libavutil/internal.h" | 27 | #include "libavutil/internal.h" |
| 28 | #include "libavutil/mem_internal.h" | ||
| 29 | |||
| 28 | #include "avcodec.h" | 30 | #include "avcodec.h" |
| 29 | #include "h261.h" | 31 | #include "h261.h" |
| 30 | #include "mpegutils.h" | 32 | #include "mpegutils.h" |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include "libavutil/attributes.h" | 23 | #include "libavutil/attributes.h" |
| 24 | #include "libavutil/cpu.h" | 24 | #include "libavutil/cpu.h" |
| 25 | #include "libavutil/internal.h" | 25 | #include "libavutil/internal.h" |
| 26 | #include "libavutil/mem_internal.h" | ||
| 26 | #include "libavutil/ppc/cpu.h" | 27 | #include "libavutil/ppc/cpu.h" |
| 27 | #include "libavutil/ppc/util_altivec.h" | 28 | #include "libavutil/ppc/util_altivec.h" |
| 28 | #include "libavcodec/mpegaudiodsp.h" | 29 | #include "libavcodec/mpegaudiodsp.h" |
| @@ -29,6 +29,8 @@ · 28 unmodified lines | |||
| 29 | #define LONG_BITSTREAM_READER | 29 | #define LONG_BITSTREAM_READER |
| 30 | 30 | ||
| 31 | #include "libavutil/internal.h" | 31 | #include "libavutil/internal.h" |
| 32 | #include "libavutil/mem_internal.h" | ||
| 33 | |||
| 32 | #include "avcodec.h" | 34 | #include "avcodec.h" |
| 33 | #include "get_bits.h" | 35 | #include "get_bits.h" |
| 34 | #include "idctdsp.h" | 36 | #include "idctdsp.h" |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | * Known FOURCCs: 'ap4h' (444), 'apch' (HQ), 'apcn' (422), 'apcs' (LT), 'acpo' (Proxy) | 27 | * Known FOURCCs: 'ap4h' (444), 'apch' (HQ), 'apcn' (422), 'apcs' (LT), 'acpo' (Proxy) |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include "libavutil/mem_internal.h" | ||
| 30 | #include "libavutil/opt.h" | 31 | #include "libavutil/opt.h" |
| 31 | #include "avcodec.h" | 32 | #include "avcodec.h" |
| 32 | #include "dct.h" | 33 | #include "dct.h" |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include "libavutil/channel_layout.h" | 22 | #include "libavutil/channel_layout.h" |
| 23 | #include "libavutil/float_dsp.h" | 23 | #include "libavutil/float_dsp.h" |
| 24 | #include "libavutil/internal.h" | 24 | #include "libavutil/internal.h" |
| 25 | #include "libavutil/mem_internal.h" | ||
| 25 | 26 | ||
| 26 | #define BITSTREAM_READER_LE | 27 | #define BITSTREAM_READER_LE |
| 27 | #include "avcodec.h" | 28 | #include "avcodec.h" |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include "libavutil/avassert.h" | 27 | #include "libavutil/avassert.h" |
| 28 | #include "libavutil/imgutils.h" | 28 | #include "libavutil/imgutils.h" |
| 29 | #include "libavutil/internal.h" | 29 | #include "libavutil/internal.h" |
| 30 | #include "libavutil/mem_internal.h" | ||
| 30 | #include "libavutil/thread.h" | 31 | #include "libavutil/thread.h" |
| 31 | 32 | ||
| 32 | #include "avcodec.h" | 33 | #include "avcodec.h" |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | 28 | ||
| 29 | #include "config.h" | 29 | #include "config.h" |
| 30 | #include "libavutil/attributes.h" | 30 | #include "libavutil/attributes.h" |
| 31 | #include "libavutil/mem_internal.h" | ||
| 31 | 32 | ||
| 32 | #include "avcodec.h" | 33 | #include "avcodec.h" |
| 33 | #include "get_bits.h" | 34 | #include "get_bits.h" |
| @@ -38,6 +38,7 @@ · 37 unmodified lines | |||
| 38 | #include "libavutil/common.h" | 38 | #include "libavutil/common.h" |
| 39 | #include "libavutil/internal.h" | 39 | #include "libavutil/internal.h" |
| 40 | #include "libavutil/lfg.h" | 40 | #include "libavutil/lfg.h" |
| 41 | #include "libavutil/mem_internal.h" | ||
| 41 | #include "libavutil/time.h" | 42 | #include "libavutil/time.h" |
| 42 | 43 | ||
| 43 | #include "libavcodec/dct.h" | 44 | #include "libavcodec/dct.h" |
| @@ -18,6 +18,8 @@ · 17 unmodified lines | |||
| 18 | 18 | ||
| 19 | #include "config.h" | 19 | #include "config.h" |
| 20 | 20 | ||
| 21 | #include "libavutil/mem_internal.h" | ||
| 22 | |||
| 21 | #include "libavcodec/x86/fdct.h" | 23 | #include "libavcodec/x86/fdct.h" |
| 22 | #include "libavcodec/x86/xvididct.h" | 24 | #include "libavcodec/x86/xvididct.h" |
| 23 | #include "libavcodec/x86/simple_idct.h" | 25 | #include "libavcodec/x86/simple_idct.h" |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "libavutil/imgutils.h" | 27 | #include "libavutil/imgutils.h" |
| 28 | #include "libavutil/mem_internal.h" | ||
| 28 | 29 | ||
| 29 | #include "avcodec.h" | 30 | #include "avcodec.h" |
| 30 | #include "hwconfig.h" | 31 | #include "hwconfig.h" |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include "libavutil/avassert.h" | 24 | #include "libavutil/avassert.h" |
| 25 | #include "libavutil/mem_internal.h" | ||
| 25 | 26 | ||
| 26 | #include "avcodec.h" | 27 | #include "avcodec.h" |
| 27 | #include "internal.h" | 28 | #include "internal.h" |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | #include "libavutil/attributes.h" | 25 | #include "libavutil/attributes.h" |
| 26 | #include "libavutil/common.h" | 26 | #include "libavutil/common.h" |
| 27 | #include "libavutil/cpu.h" | 27 | #include "libavutil/cpu.h" |
| 28 | #include "libavutil/mem_internal.h" | ||
| 28 | #include "libavutil/x86/asm.h" | 29 | #include "libavutil/x86/asm.h" |
| 29 | #include "libavutil/x86/cpu.h" | 30 | #include "libavutil/x86/cpu.h" |
| 30 | #include "libavcodec/cavsdsp.h" | 31 | #include "libavcodec/cavsdsp.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include "libavutil/attributes.h" | 22 | #include "libavutil/attributes.h" |
| 23 | #include "libavutil/cpu.h" | 23 | #include "libavutil/cpu.h" |
| 24 | #include "libavutil/mem_internal.h" | ||
| 24 | #include "libavutil/x86/asm.h" | 25 | #include "libavutil/x86/asm.h" |
| 25 | #include "libavutil/x86/cpu.h" | 26 | #include "libavutil/x86/cpu.h" |
| 26 | #include "libavcodec/h264dec.h" | 27 | #include "libavcodec/h264dec.h" |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include "config.h" | 22 | #include "config.h" |
| 23 | 23 | ||
| 24 | #include "libavutil/cpu.h" | 24 | #include "libavutil/cpu.h" |
| 25 | #include "libavutil/mem_internal.h" | ||
| 25 | #include "libavutil/x86/asm.h" | 26 | #include "libavutil/x86/asm.h" |
| 26 | #include "libavutil/x86/cpu.h" | 27 | #include "libavutil/x86/cpu.h" |
| 27 | #include "libavcodec/get_bits.h" /* required for hevcdsp.h GetBitContext */ | 28 | #include "libavcodec/get_bits.h" /* required for hevcdsp.h GetBitContext */ |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include "libavutil/attributes.h" | 22 | #include "libavutil/attributes.h" |
| 23 | #include "libavutil/cpu.h" | 23 | #include "libavutil/cpu.h" |
| 24 | #include "libavutil/internal.h" | 24 | #include "libavutil/internal.h" |
| 25 | #include "libavutil/mem_internal.h" | ||
| 25 | #include "libavutil/x86/asm.h" | 26 | #include "libavutil/x86/asm.h" |
| 26 | #include "libavutil/x86/cpu.h" | 27 | #include "libavutil/x86/cpu.h" |
| 27 | #include "libavcodec/mpegaudiodsp.h" | 28 | #include "libavcodec/mpegaudiodsp.h" |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include <stdint.h> | 23 | #include <stdint.h> |
| 24 | 24 | ||
| 25 | #include "libavutil/internal.h" | 25 | #include "libavutil/internal.h" |
| 26 | #include "libavutil/mem_internal.h" | ||
| 26 | #include "libavutil/x86/asm.h" | 27 | #include "libavutil/x86/asm.h" |
| 27 | #include "libavcodec/mpegutils.h" | 28 | #include "libavcodec/mpegutils.h" |
| 28 | #include "libavcodec/mpegvideo.h" | 29 | #include "libavcodec/mpegvideo.h" |
| @@ -29,6 +29,7 @@ · 28 unmodified lines | |||
| 29 | #include "libavcodec/rv34dsp.h" | 29 | #include "libavcodec/rv34dsp.h" |
| 30 | #include "libavutil/attributes.h" | 30 | #include "libavutil/attributes.h" |
| 31 | #include "libavutil/mem.h" | 31 | #include "libavutil/mem.h" |
| 32 | #include "libavutil/mem_internal.h" | ||
| 32 | #include "libavutil/x86/cpu.h" | 33 | #include "libavutil/x86/cpu.h" |
| 33 | #include "hpeldsp.h" | 34 | #include "hpeldsp.h" |
| 34 | 35 | ||
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | 26 | ||
| 27 | #include "libavutil/cpu.h" | 27 | #include "libavutil/cpu.h" |
| 28 | #include "libavutil/mem.h" | 28 | #include "libavutil/mem.h" |
| 29 | #include "libavutil/mem_internal.h" | ||
| 29 | #include "libavutil/x86/asm.h" | 30 | #include "libavutil/x86/asm.h" |
| 30 | #include "libavutil/x86/cpu.h" | 31 | #include "libavutil/x86/cpu.h" |
| 31 | #include "libavcodec/vc1dsp.h" | 32 | #include "libavcodec/vc1dsp.h" |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include "libavutil/attributes.h" | 23 | #include "libavutil/attributes.h" |
| 24 | #include "libavutil/cpu.h" | 24 | #include "libavutil/cpu.h" |
| 25 | #include "libavutil/mem.h" | 25 | #include "libavutil/mem.h" |
| 26 | #include "libavutil/mem_internal.h" | ||
| 26 | #include "libavutil/x86/cpu.h" | 27 | #include "libavutil/x86/cpu.h" |
| 27 | #include "libavcodec/vp8dsp.h" | 28 | #include "libavcodec/vp8dsp.h" |
| 28 | 29 | ||
| @@ -23,6 +23,8 @@ · 22 unmodified lines | |||
| 23 | #ifndef AVCODEC_X86_VP9DSP_INIT_H | 23 | #ifndef AVCODEC_X86_VP9DSP_INIT_H |
| 24 | #define AVCODEC_X86_VP9DSP_INIT_H | 24 | #define AVCODEC_X86_VP9DSP_INIT_H |
| 25 | 25 | ||
| 26 | #include "libavutil/mem_internal.h" | ||
| 27 | |||
| 26 | #include "libavcodec/vp9dsp.h" | 28 | #include "libavcodec/vp9dsp.h" |
| 27 | 29 | ||
| 28 | // hack to force-expand BPC | 30 | // hack to force-expand BPC |
| @@ -36,6 +36,7 @@ · 35 unmodified lines | |||
| 36 | #include "libavutil/avassert.h" | 36 | #include "libavutil/avassert.h" |
| 37 | #include "libavutil/avstring.h" | 37 | #include "libavutil/avstring.h" |
| 38 | #include "libavutil/float_dsp.h" | 38 | #include "libavutil/float_dsp.h" |
| 39 | #include "libavutil/mem_internal.h" | ||
| 39 | #include "libavutil/opt.h" | 40 | #include "libavutil/opt.h" |
| 40 | #include "libavutil/tx.h" | 41 | #include "libavutil/tx.h" |
| 41 | #include "avfilter.h" | 42 | #include "avfilter.h" |
| @@ -92,10 +92,6 @@ · 91 unmodified lines | |||
| 92 | type av_##name##_get_##field(const str *s) { return s->field; } \ | 92 | type av_##name##_get_##field(const str *s) { return s->field; } \ |
| 93 | void av_##name##_set_##field(str *s, type v) { s->field = v; } | 93 | void av_##name##_set_##field(str *s, type v) { s->field = v; } |
| 94 | 94 | ||
| 95 | // Some broken preprocessors need a second expansion | ||
| 96 | // to be forced to tokenize __VA_ARGS__ | ||
| 97 | #define E1(x) x | ||
| 98 | |||
| 99 | /* Check if the hard coded offset of a struct member still matches reality. | 95 | /* Check if the hard coded offset of a struct member still matches reality. |
| 100 | * Induce a compilation failure if not. | 96 | * Induce a compilation failure if not. |
| 101 | */ | 97 | */ |
| @@ -103,39 +99,6 @@ · 1 unmodified line | |||
| 103 | int x_##o[offsetof(s, m) == o? 1: -1]; \ | 99 | int x_##o[offsetof(s, m) == o? 1: -1]; \ |
| 104 | } | 100 | } |
| 105 | 101 | ||
| 106 | #define LOCAL_ALIGNED_A(a, t, v, s, o, ...) \ | ||
| 107 | uint8_t la_##v[sizeof(t s o) + (a)]; \ | ||
| 108 | t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a) | ||
| 109 | |||
| 110 | #define LOCAL_ALIGNED_D(a, t, v, s, o, ...) \ | ||
| 111 | DECLARE_ALIGNED(a, t, la_##v) s o; \ | ||
| 112 | t (*v) o = la_##v | ||
| 113 | |||
| 114 | #define LOCAL_ALIGNED(a, t, v, ...) LOCAL_ALIGNED_##a(t, v, __VA_ARGS__) | ||
| 115 | |||
| 116 | #if HAVE_LOCAL_ALIGNED | ||
| 117 | # define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_D(4, t, v, __VA_ARGS__,,)) | ||
| 118 | #else | ||
| 119 | # define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_A(4, t, v, __VA_ARGS__,,)) | ||
| 120 | #endif | ||
| 121 | |||
| 122 | #if HAVE_LOCAL_ALIGNED | ||
| 123 | # define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,)) | ||
| 124 | #else | ||
| 125 | # define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_A(8, t, v, __VA_ARGS__,,)) | ||
| 126 | #endif | ||
| 127 | |||
| 128 | #if HAVE_LOCAL_ALIGNED | ||
| 129 | # define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,)) | ||
| 130 | #else | ||
| 131 | # define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_A(16, t, v, __VA_ARGS__,,)) | ||
| 132 | #endif | ||
| 133 | |||
| 134 | #if HAVE_LOCAL_ALIGNED | ||
| 135 | # define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_D(32, t, v, __VA_ARGS__,,)) | ||
| 136 | #else | ||
| 137 | # define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_A(32, t, v, __VA_ARGS__,,)) | ||
| 138 | #endif | ||
| 139 | 102 | ||
| 140 | #define FF_ALLOC_TYPED_ARRAY(p, nelem) (p = av_malloc_array(nelem, sizeof(*p))) | 103 | #define FF_ALLOC_TYPED_ARRAY(p, nelem) (p = av_malloc_array(nelem, sizeof(*p))) |
| 141 | #define FF_ALLOCZ_TYPED_ARRAY(p, nelem) (p = av_mallocz_array(nelem, sizeof(*p))) | 104 | #define FF_ALLOCZ_TYPED_ARRAY(p, nelem) (p = av_mallocz_array(nelem, sizeof(*p))) |
| @@ -21,9 +21,51 @@ · 20 unmodified lines | |||
| 21 | #ifndef AVUTIL_MEM_INTERNAL_H | 21 | #ifndef AVUTIL_MEM_INTERNAL_H |
| 22 | #define AVUTIL_MEM_INTERNAL_H | 22 | #define AVUTIL_MEM_INTERNAL_H |
| 23 | 23 | ||
| 24 | #include "config.h" | ||
| 25 | |||
| 26 | #include <stdint.h> | ||
| 27 | |||
| 24 | #include "avassert.h" | 28 | #include "avassert.h" |
| 25 | #include "mem.h" | 29 | #include "mem.h" |
| 26 | 30 | ||
| 31 | // Some broken preprocessors need a second expansion | ||
| 32 | // to be forced to tokenize __VA_ARGS__ | ||
| 33 | #define E1(x) x | ||
| 34 | |||
| 35 | #define LOCAL_ALIGNED_A(a, t, v, s, o, ...) \ | ||
| 36 | uint8_t la_##v[sizeof(t s o) + (a)]; \ | ||
| 37 | t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a) | ||
| 38 | |||
| 39 | #define LOCAL_ALIGNED_D(a, t, v, s, o, ...) \ | ||
| 40 | DECLARE_ALIGNED(a, t, la_##v) s o; \ | ||
| 41 | t (*v) o = la_##v | ||
| 42 | |||
| 43 | #define LOCAL_ALIGNED(a, t, v, ...) LOCAL_ALIGNED_##a(t, v, __VA_ARGS__) | ||
| 44 | |||
| 45 | #if HAVE_LOCAL_ALIGNED | ||
| 46 | # define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_D(4, t, v, __VA_ARGS__,,)) | ||
| 47 | #else | ||
| 48 | # define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_A(4, t, v, __VA_ARGS__,,)) | ||
| 49 | #endif | ||
| 50 | |||
| 51 | #if HAVE_LOCAL_ALIGNED | ||
| 52 | # define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,)) | ||
| 53 | #else | ||
| 54 | # define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_A(8, t, v, __VA_ARGS__,,)) | ||
| 55 | #endif | ||
| 56 | |||
| 57 | #if HAVE_LOCAL_ALIGNED | ||
| 58 | # define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,)) | ||
| 59 | #else | ||
| 60 | # define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_A(16, t, v, __VA_ARGS__,,)) | ||
| 61 | #endif | ||
| 62 | |||
| 63 | #if HAVE_LOCAL_ALIGNED | ||
| 64 | # define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_D(32, t, v, __VA_ARGS__,,)) | ||
| 65 | #else | ||
| 66 | # define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_A(32, t, v, __VA_ARGS__,,)) | ||
| 67 | #endif | ||
| 68 | |||
| 27 | static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc) | 69 | static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc) |
| 28 | { | 70 | { |
| 29 | void *val; | 71 | void *val; |
| @@ -25,6 +25,8 @@ · 24 unmodified lines | |||
| 25 | #define AVUTIL_MIPS_MMIUTILS_H | 25 | #define AVUTIL_MIPS_MMIUTILS_H |
| 26 | 26 | ||
| 27 | #include "config.h" | 27 | #include "config.h" |
| 28 | |||
| 29 | #include "libavutil/mem_internal.h" | ||
| 28 | #include "libavutil/mips/asmdefs.h" | 30 | #include "libavutil/mips/asmdefs.h" |
| 29 | 31 | ||
| 30 | #if HAVE_LOONGSON2 | 32 | #if HAVE_LOONGSON2 |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include "libavutil/internal.h" | 22 | #include "libavutil/internal.h" |
| 23 | #include "libavutil/lfg.h" | 23 | #include "libavutil/lfg.h" |
| 24 | #include "libavutil/lls.h" | 24 | #include "libavutil/lls.h" |
| 25 | #include "libavutil/mem_internal.h" | ||
| 25 | 26 | ||
| 26 | int main(void) | 27 | int main(void) |
| 27 | { | 28 | { |
| @@ -21,6 +21,8 @@ · 20 unmodified lines | |||
| 21 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 21 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include "libavutil/mem_internal.h" | ||
| 25 | |||
| 24 | static void FUNC(yuv2planeX_8_16)(const int16_t *filter, int filterSize, | 26 | static void FUNC(yuv2planeX_8_16)(const int16_t *filter, int filterSize, |
| 25 | const int16_t **src, uint8_t *dest, | 27 | const int16_t **src, uint8_t *dest, |
| 26 | const uint8_t *dither, int offset, int x) | 28 | const uint8_t *dither, int offset, int x) |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | #include "libswscale/swscale_internal.h" | 28 | #include "libswscale/swscale_internal.h" |
| 29 | #include "libavutil/attributes.h" | 29 | #include "libavutil/attributes.h" |
| 30 | #include "libavutil/cpu.h" | 30 | #include "libavutil/cpu.h" |
| 31 | #include "libavutil/mem_internal.h" | ||
| 31 | #include "yuv2rgb_altivec.h" | 32 | #include "yuv2rgb_altivec.h" |
| 32 | #include "libavutil/ppc/util_altivec.h" | 33 | #include "libavutil/ppc/util_altivec.h" |
| 33 | 34 | ||
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | 18 | ||
| 19 | #include "libavcodec/aacpsdsp.h" | 19 | #include "libavcodec/aacpsdsp.h" |
| 20 | #include "libavutil/intfloat.h" | 20 | #include "libavutil/intfloat.h" |
| 21 | #include "libavutil/mem_internal.h" | ||
| 21 | 22 | ||
| 22 | #include "checkasm.h" | 23 | #include "checkasm.h" |
| 23 | 24 | ||
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | 23 | ||
| 24 | #include "libavfilter/af_afir.h" | 24 | #include "libavfilter/af_afir.h" |
| 25 | #include "libavutil/internal.h" | 25 | #include "libavutil/internal.h" |
| 26 | #include "libavutil/mem_internal.h" | ||
| 26 | #include "checkasm.h" | 27 | #include "checkasm.h" |
| 27 | 28 | ||
| 28 | #define LEN 256 | 29 | #define LEN 256 |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "libavcodec/mathops.h" | 24 | #include "libavcodec/mathops.h" |
| 25 | #include "libavutil/common.h" | 25 | #include "libavutil/common.h" |
| 26 | #include "libavutil/internal.h" | 26 | #include "libavutil/internal.h" |
| 27 | #include "libavutil/mem_internal.h" | ||
| 27 | 28 | ||
| 28 | #define BUF_SIZE 256 | 29 | #define BUF_SIZE 256 |
| 29 | #define MAX_CHANNELS 2 | 30 | #define MAX_CHANNELS 2 |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | #include "libavutil/common.h" | 26 | #include "libavutil/common.h" |
| 27 | #include "libavutil/intreadwrite.h" | 27 | #include "libavutil/intreadwrite.h" |
| 28 | #include "libavutil/mem_internal.h" | ||
| 28 | 29 | ||
| 29 | #include "checkasm.h" | 30 | #include "checkasm.h" |
| 30 | 31 | ||
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include "libavutil/common.h" | 27 | #include "libavutil/common.h" |
| 28 | #include "libavutil/internal.h" | 28 | #include "libavutil/internal.h" |
| 29 | #include "libavutil/intreadwrite.h" | 29 | #include "libavutil/intreadwrite.h" |
| 30 | #include "libavutil/mem_internal.h" | ||
| 30 | 31 | ||
| 31 | #define randomize_buffers(size) \ | 32 | #define randomize_buffers(size) \ |
| 32 | do { \ | 33 | do { \ |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "libavutil/common.h" | 24 | #include "libavutil/common.h" |
| 25 | #include "libavutil/internal.h" | 25 | #include "libavutil/internal.h" |
| 26 | #include "libavutil/intreadwrite.h" | 26 | #include "libavutil/intreadwrite.h" |
| 27 | #include "libavutil/mem_internal.h" | ||
| 27 | 28 | ||
| 28 | #define BUF_SIZE 512 | 29 | #define BUF_SIZE 512 |
| 29 | 30 | ||
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "libavcodec/avcodec.h" | 24 | #include "libavcodec/avcodec.h" |
| 25 | #include "libavcodec/exrdsp.h" | 25 | #include "libavcodec/exrdsp.h" |
| 26 | #include "libavutil/intreadwrite.h" | 26 | #include "libavutil/intreadwrite.h" |
| 27 | #include "libavutil/mem_internal.h" | ||
| 27 | 28 | ||
| 28 | #define BUF_SIZE 5120 | 29 | #define BUF_SIZE 5120 |
| 29 | #define PADDED_BUF_SIZE BUF_SIZE+AV_INPUT_BUFFER_PADDING_SIZE*2 | 30 | #define PADDED_BUF_SIZE BUF_SIZE+AV_INPUT_BUFFER_PADDING_SIZE*2 |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include "libavutil/fixed_dsp.h" | 23 | #include "libavutil/fixed_dsp.h" |
| 24 | #include "libavutil/internal.h" | 24 | #include "libavutil/internal.h" |
| 25 | #include "libavutil/mem.h" | 25 | #include "libavutil/mem.h" |
| 26 | #include "libavutil/mem_internal.h" | ||
| 26 | 27 | ||
| 27 | #define BUF_SIZE 256 | 28 | #define BUF_SIZE 256 |
| 28 | 29 | ||
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "libavutil/common.h" | 24 | #include "libavutil/common.h" |
| 25 | #include "libavutil/internal.h" | 25 | #include "libavutil/internal.h" |
| 26 | #include "libavutil/intreadwrite.h" | 26 | #include "libavutil/intreadwrite.h" |
| 27 | #include "libavutil/mem_internal.h" | ||
| 27 | 28 | ||
| 28 | #define BUF_SIZE 256 | 29 | #define BUF_SIZE 256 |
| 29 | #define MAX_CHANNELS 8 | 30 | #define MAX_CHANNELS 8 |
| @@ -23,6 +23,8 @@ · 22 unmodified lines | |||
| 23 | 23 | ||
| 24 | #include "libavutil/float_dsp.h" | 24 | #include "libavutil/float_dsp.h" |
| 25 | #include "libavutil/internal.h" | 25 | #include "libavutil/internal.h" |
| 26 | #include "libavutil/mem_internal.h" | ||
| 27 | |||
| 26 | #include "checkasm.h" | 28 | #include "checkasm.h" |
| 27 | 29 | ||
| 28 | #define LEN 256 | 30 | #define LEN 256 |
| @@ -24,6 +24,8 @@ · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | #include "libavutil/internal.h" | 25 | #include "libavutil/internal.h" |
| 26 | #include "libavutil/common.h" | 26 | #include "libavutil/common.h" |
| 27 | #include "libavutil/mem_internal.h" | ||
| 28 | |||
| 27 | #include "libavcodec/fmtconvert.h" | 29 | #include "libavcodec/fmtconvert.h" |
| 28 | 30 | ||
| 29 | #include "checkasm.h" | 31 | #include "checkasm.h" |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | #include "libavutil/common.h" | 26 | #include "libavutil/common.h" |
| 27 | #include "libavutil/internal.h" | 27 | #include "libavutil/internal.h" |
| 28 | #include "libavutil/intreadwrite.h" | 28 | #include "libavutil/intreadwrite.h" |
| 29 | #include "libavutil/mem_internal.h" | ||
| 29 | 30 | ||
| 30 | static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff }; | 31 | static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff }; |
| 31 | static const uint32_t pixel_mask_lf[3] = { 0xff0fff0f, 0x01ff000f, 0x03ff000f }; | 32 | static const uint32_t pixel_mask_lf[3] = { 0xff0fff0f, 0x01ff000f, 0x03ff000f }; |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | #include "libavutil/common.h" | 25 | #include "libavutil/common.h" |
| 26 | #include "libavutil/internal.h" | 26 | #include "libavutil/internal.h" |
| 27 | #include "libavutil/intreadwrite.h" | 27 | #include "libavutil/intreadwrite.h" |
| 28 | #include "libavutil/mem_internal.h" | ||
| 28 | 29 | ||
| 29 | static const int codec_ids[4] = { AV_CODEC_ID_H264, AV_CODEC_ID_VP8, AV_CODEC_ID_RV40, AV_CODEC_ID_SVQ3 }; | 30 | static const int codec_ids[4] = { AV_CODEC_ID_H264, AV_CODEC_ID_VP8, AV_CODEC_ID_RV40, AV_CODEC_ID_SVQ3 }; |
| 30 | 31 | ||
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "libavutil/common.h" | 24 | #include "libavutil/common.h" |
| 25 | #include "libavutil/internal.h" | 25 | #include "libavutil/internal.h" |
| 26 | #include "libavutil/intreadwrite.h" | 26 | #include "libavutil/intreadwrite.h" |
| 27 | #include "libavutil/mem_internal.h" | ||
| 27 | 28 | ||
| 28 | static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff }; | 29 | static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff }; |
| 29 | 30 | ||
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | #include <string.h> | 21 | #include <string.h> |
| 22 | 22 | ||
| 23 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 24 | #include "libavutil/mem_internal.h" | ||
| 24 | 25 | ||
| 25 | #include "libavcodec/hevcdsp.h" | 26 | #include "libavcodec/hevcdsp.h" |
| 26 | 27 | ||
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | #include <string.h> | 21 | #include <string.h> |
| 22 | 22 | ||
| 23 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 24 | #include "libavutil/mem_internal.h" | ||
| 24 | 25 | ||
| 25 | #include "libavcodec/hevcdsp.h" | 26 | #include "libavcodec/hevcdsp.h" |
| 26 | 27 | ||
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | #include <string.h> | 21 | #include <string.h> |
| 22 | 22 | ||
| 23 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 24 | #include "libavutil/mem_internal.h" | ||
| 24 | 25 | ||
| 25 | #include "libavcodec/avcodec.h" | 26 | #include "libavcodec/avcodec.h" |
| 26 | 27 | ||
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include "libavutil/common.h" | 23 | #include "libavutil/common.h" |
| 24 | #include "libavutil/internal.h" | 24 | #include "libavutil/internal.h" |
| 25 | #include "libavutil/intreadwrite.h" | 25 | #include "libavutil/intreadwrite.h" |
| 26 | #include "libavutil/mem_internal.h" | ||
| 26 | 27 | ||
| 27 | #define BUF_SIZE 512 | 28 | #define BUF_SIZE 512 |
| 28 | 29 | ||
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include "libavutil/common.h" | 23 | #include "libavutil/common.h" |
| 24 | #include "libavutil/intreadwrite.h" | 24 | #include "libavutil/intreadwrite.h" |
| 25 | #include "libavutil/mem.h" | 25 | #include "libavutil/mem.h" |
| 26 | #include "libavutil/mem_internal.h" | ||
| 26 | 27 | ||
| 27 | #include "libavcodec/lossless_videoencdsp.h" | 28 | #include "libavcodec/lossless_videoencdsp.h" |
| 28 | 29 | ||
| @@ -16,6 +16,8 @@ · 15 unmodified lines | |||
| 16 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 16 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include "libavutil/mem_internal.h" | ||
| 20 | |||
| 19 | #include "libavcodec/opusdsp.h" | 21 | #include "libavcodec/opusdsp.h" |
| 20 | 22 | ||
| 21 | #include "checkasm.h" | 23 | #include "checkasm.h" |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "libavutil/common.h" | 24 | #include "libavutil/common.h" |
| 25 | #include "libavutil/internal.h" | 25 | #include "libavutil/internal.h" |
| 26 | #include "libavutil/intreadwrite.h" | 26 | #include "libavutil/intreadwrite.h" |
| 27 | #include "libavutil/mem_internal.h" | ||
| 27 | 28 | ||
| 28 | #define BUF_UNITS 8 | 29 | #define BUF_UNITS 8 |
| 29 | #define BUF_SIZE (BUF_UNITS * 128 + 8 * BUF_UNITS) | 30 | #define BUF_SIZE (BUF_UNITS * 128 + 8 * BUF_UNITS) |
| @@ -16,6 +16,8 @@ · 15 unmodified lines | |||
| 16 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 16 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include "libavutil/mem_internal.h" | ||
| 20 | |||
| 19 | #include "libavcodec/sbrdsp.h" | 21 | #include "libavcodec/sbrdsp.h" |
| 20 | #include <float.h> | 22 | #include <float.h> |
| 21 | 23 | ||
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include "libavutil/common.h" | 22 | #include "libavutil/common.h" |
| 23 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 24 | #include "libavutil/mem.h" | 24 | #include "libavutil/mem.h" |
| 25 | #include "libavutil/mem_internal.h" | ||
| 25 | 26 | ||
| 26 | #include "libswscale/rgb2rgb.h" | 27 | #include "libswscale/rgb2rgb.h" |
| 27 | 28 | ||
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include "libavutil/common.h" | 22 | #include "libavutil/common.h" |
| 23 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 24 | #include "libavutil/mem.h" | 24 | #include "libavutil/mem.h" |
| 25 | #include "libavutil/mem_internal.h" | ||
| 25 | 26 | ||
| 26 | #include "libswscale/swscale.h" | 27 | #include "libswscale/swscale.h" |
| 27 | #include "libswscale/swscale_internal.h" | 28 | #include "libswscale/swscale_internal.h" |
| @@ -25,6 +25,8 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | #include "libavutil/internal.h" | 26 | #include "libavutil/internal.h" |
| 27 | #include "libavutil/intfloat.h" | 27 | #include "libavutil/intfloat.h" |
| 28 | #include "libavutil/mem_internal.h" | ||
| 29 | |||
| 28 | #include "libavcodec/dcadata.h" | 30 | #include "libavcodec/dcadata.h" |
| 29 | #include "libavcodec/synth_filter.h" | 31 | #include "libavcodec/synth_filter.h" |
| 30 | 32 | ||
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "libavcodec/avcodec.h" | 24 | #include "libavcodec/avcodec.h" |
| 25 | #include "libavcodec/utvideodsp.h" | 25 | #include "libavcodec/utvideodsp.h" |
| 26 | #include "libavutil/intreadwrite.h" | 26 | #include "libavutil/intreadwrite.h" |
| 27 | #include "libavutil/mem_internal.h" | ||
| 27 | 28 | ||
| 28 | #define WIDTH 240 | 29 | #define WIDTH 240 |
| 29 | #define HEIGHT 120 | 30 | #define HEIGHT 120 |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "libavutil/common.h" | 24 | #include "libavutil/common.h" |
| 25 | #include "libavutil/internal.h" | 25 | #include "libavutil/internal.h" |
| 26 | #include "libavutil/intreadwrite.h" | 26 | #include "libavutil/intreadwrite.h" |
| 27 | #include "libavutil/mem_internal.h" | ||
| 27 | 28 | ||
| 28 | #define BUF_SIZE 512 | 29 | #define BUF_SIZE 512 |
| 29 | 30 | ||
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "libavutil/common.h" | 24 | #include "libavutil/common.h" |
| 25 | #include "libavutil/internal.h" | 25 | #include "libavutil/internal.h" |
| 26 | #include "libavutil/intreadwrite.h" | 26 | #include "libavutil/intreadwrite.h" |
| 27 | #include "libavutil/mem_internal.h" | ||
| 27 | 28 | ||
| 28 | #define W 64 | 29 | #define W 64 |
| 29 | #define H 64 | 30 | #define H 64 |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | #include "libavfilter/avfilter.h" | 21 | #include "libavfilter/avfilter.h" |
| 22 | #include "libavfilter/vf_eq.h" | 22 | #include "libavfilter/vf_eq.h" |
| 23 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 24 | #include "libavutil/mem_internal.h" | ||
| 24 | 25 | ||
| 25 | #define WIDTH 256 | 26 | #define WIDTH 256 |
| 26 | #define HEIGHT 256 | 27 | #define HEIGHT 256 |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | #include "checkasm.h" | 20 | #include "checkasm.h" |
| 21 | #include "libavfilter/hflip.h" | 21 | #include "libavfilter/hflip.h" |
| 22 | #include "libavutil/intreadwrite.h" | 22 | #include "libavutil/intreadwrite.h" |
| 23 | #include "libavutil/mem_internal.h" | ||
| 23 | 24 | ||
| 24 | #define WIDTH 256 | 25 | #define WIDTH 256 |
| 25 | #define WIDTH_PADDED 256 + 32 | 26 | #define WIDTH_PADDED 256 + 32 |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | #include "checkasm.h" | 20 | #include "checkasm.h" |
| 21 | #include "libavfilter/threshold.h" | 21 | #include "libavfilter/threshold.h" |
| 22 | #include "libavutil/intreadwrite.h" | 22 | #include "libavutil/intreadwrite.h" |
| 23 | #include "libavutil/mem_internal.h" | ||
| 23 | 24 | ||
| 24 | #define WIDTH 256 | 25 | #define WIDTH 256 |
| 25 | #define WIDTH_PADDED 256 + 32 | 26 | #define WIDTH_PADDED 256 + 32 |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include "libavcodec/videodsp.h" | 23 | #include "libavcodec/videodsp.h" |
| 24 | #include "libavutil/internal.h" | 24 | #include "libavutil/internal.h" |
| 25 | #include "libavutil/intreadwrite.h" | 25 | #include "libavutil/intreadwrite.h" |
| 26 | #include "libavutil/mem_internal.h" | ||
| 26 | 27 | ||
| 27 | #define randomize_buffers(w, h) \ | 28 | #define randomize_buffers(w, h) \ |
| 28 | do { \ | 29 | do { \ |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | #include "libavutil/common.h" | 26 | #include "libavutil/common.h" |
| 27 | #include "libavutil/intreadwrite.h" | 27 | #include "libavutil/intreadwrite.h" |
| 28 | #include "libavutil/mem_internal.h" | ||
| 28 | 29 | ||
| 29 | #include "checkasm.h" | 30 | #include "checkasm.h" |
| 30 | 31 | ||
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include "libavutil/internal.h" | 27 | #include "libavutil/internal.h" |
| 28 | #include "libavutil/intreadwrite.h" | 28 | #include "libavutil/intreadwrite.h" |
| 29 | #include "libavutil/mathematics.h" | 29 | #include "libavutil/mathematics.h" |
| 30 | #include "libavutil/mem_internal.h" | ||
| 30 | 31 | ||
| 31 | static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff }; | 32 | static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff }; |
| 32 | #define SIZEOF_PIXEL ((bit_depth + 7) / 8) | 33 | #define SIZEOF_PIXEL ((bit_depth + 7) / 8) |