Commit 1d9c2dc8 authored by Martin Storsjö's avatar Martin Storsjö

Don't include common.h from avutil.h

Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent 93f257db
...@@ -13,6 +13,9 @@ libavutil: 2011-04-18 ...@@ -13,6 +13,9 @@ libavutil: 2011-04-18
API changes, most recent first: API changes, most recent first:
2012-08-08 - xxxxxxx - lavu 51.39 - avutil.h
Don't implicitly include libavutil/common.h in avutil.h
2012-08-08 - xxxxxxx - lavu 51.38 - dict.h 2012-08-08 - xxxxxxx - lavu 51.38 - dict.h
Add av_dict_count(). Add av_dict_count().
......
...@@ -33,7 +33,9 @@ ...@@ -33,7 +33,9 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/common.h"
/** decoder context */ /** decoder context */
typedef struct EightSvxContext { typedef struct EightSvxContext {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "a64tables.h" #include "a64tables.h"
#include "elbg.h" #include "elbg.h"
#include "internal.h" #include "internal.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#define DITHERSTEPS 8 #define DITHERSTEPS 8
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
* 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 "libavutil/common.h"
#include "parser.h" #include "parser.h"
#include "aac_ac3_parser.h" #include "aac_ac3_parser.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "libavutil/common.h"
#include "avcodec.h" #include "avcodec.h"
#include "acelp_filters.h" #include "acelp_filters.h"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
* 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 "libavutil/common.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
*/ */
#include <inttypes.h> #include <inttypes.h>
#include "libavutil/common.h"
#include "avcodec.h" #include "avcodec.h"
#include "acelp_vectors.h" #include "acelp_vectors.h"
#include "celp_math.h" #include "celp_math.h"
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
* 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 "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "adx.h" #include "adx.h"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "config.h"
#define REGISTER_HWACCEL(X,x) { \ #define REGISTER_HWACCEL(X,x) { \
extern AVHWAccel ff_##x##_hwaccel; \ extern AVHWAccel ff_##x##_hwaccel; \
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
#ifndef AVCODEC_AMR_H #ifndef AVCODEC_AMR_H
#define AVCODEC_AMR_H #define AVCODEC_AMR_H
#include <string.h>
#include "avcodec.h" #include "avcodec.h"
#ifdef AMR_USE_16BIT_TABLES #ifdef AMR_USE_16BIT_TABLES
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
* AMR wideband decoder * AMR wideband decoder
*/ */
#include "libavutil/common.h"
#include "libavutil/lfg.h" #include "libavutil/lfg.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
* ASCII/ANSI art decoder * ASCII/ANSI art decoder
*/ */
#include "libavutil/common.h"
#include "libavutil/lfg.h" #include "libavutil/lfg.h"
#include "avcodec.h" #include "avcodec.h"
#include "cga_data.h" #include "cga_data.h"
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavutil/audioconvert.h" #include "libavutil/audioconvert.h"
#include "libavutil/common.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/samplefmt.h" #include "libavutil/samplefmt.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "ass.h" #include "ass.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/common.h"
/** /**
* Generate a suitable AVCodecContext.subtitle_header for SUBTITLE_ASS. * Generate a suitable AVCodecContext.subtitle_header for SUBTITLE_ASS.
......
...@@ -19,8 +19,12 @@ ...@@ -19,8 +19,12 @@
* 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 <string.h>
#include "avcodec.h" #include "avcodec.h"
#include "ass.h" #include "ass.h"
#include "libavutil/internal.h"
#include "libavutil/mem.h"
static av_cold int ass_decode_init(AVCodecContext *avctx) static av_cold int ass_decode_init(AVCodecContext *avctx)
{ {
......
...@@ -19,8 +19,12 @@ ...@@ -19,8 +19,12 @@
* 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 <string.h>
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/internal.h"
#include "libavutil/mem.h"
static av_cold int ass_encode_init(AVCodecContext *avctx) static av_cold int ass_encode_init(AVCodecContext *avctx)
{ {
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <math.h> #include <math.h>
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* 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 "libavutil/common.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "internal.h" #include "internal.h"
#include "audio_frame_queue.h" #include "audio_frame_queue.h"
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
*/ */
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/common.h"
#include "libavutil/libm.h" #include "libavutil/libm.h"
#include "libavutil/samplefmt.h" #include "libavutil/samplefmt.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/internal.h"
typedef struct AuraDecodeContext { typedef struct AuraDecodeContext {
AVCodecContext *avctx; AVCodecContext *avctx;
......
...@@ -19,7 +19,10 @@ ...@@ -19,7 +19,10 @@
* 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 <string.h>
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/mem.h"
#include "avcodec.h" #include "avcodec.h"
void av_destruct_packet_nofree(AVPacket *pkt) void av_destruct_packet_nofree(AVPacket *pkt)
......
...@@ -18,7 +18,10 @@ ...@@ -18,7 +18,10 @@
* 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 <string.h>
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/mem.h"
static AVBitStreamFilter *first_bitstream_filter= NULL; static AVBitStreamFilter *first_bitstream_filter= NULL;
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <stdio.h> #include <stdio.h>
#include "dsputil.h" #include "dsputil.h"
#include "cavsdsp.h" #include "cavsdsp.h"
#include "libavutil/common.h"
/***************************************************************************** /*****************************************************************************
* *
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "celp_filters.h" #include "celp_filters.h"
#include "libavutil/common.h"
void ff_celp_convolve_circ(int16_t* fc_out, const int16_t* fc_in, void ff_celp_convolve_circ(int16_t* fc_out, const int16_t* fc_in,
const int16_t* filter, int len) const int16_t* filter, int len)
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "celp_math.h" #include "celp_math.h"
#include "libavutil/common.h"
/** /**
* Cosine table: base_cos[i] = (1<<15) * cos(i*PI/64) * Cosine table: base_cos[i] = (1<<15) * cos(i*PI/64)
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/common.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
static const AVCodecDescriptor codec_descriptors[] = { static const AVCodecDescriptor codec_descriptors[] = {
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/common.h"
#if CONFIG_ZLIB #if CONFIG_ZLIB
#include <zlib.h> #include <zlib.h>
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "libavutil/internal.h"
typedef struct CyuvDecodeContext { typedef struct CyuvDecodeContext {
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
*/ */
#include <math.h> #include <math.h>
#include <string.h>
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "dct.h" #include "dct.h"
......
...@@ -27,7 +27,10 @@ ...@@ -27,7 +27,10 @@
* @author Marco Gerards <marco@gnu.org> * @author Marco Gerards <marco@gnu.org>
*/ */
#include <string.h>
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
#include "parser.h" #include "parser.h"
#define DIRAC_PARSE_INFO_PREFIX 0x42424344 #define DIRAC_PARSE_INFO_PREFIX 0x42424344
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "dnxhddata.h" #include "dnxhddata.h"
#include "libavutil/common.h"
static const uint8_t dnxhd_1235_luma_weight[] = { static const uint8_t dnxhd_1235_luma_weight[] = {
0, 32, 32, 32, 33, 35, 38, 39, 0, 32, 32, 32, 33, 35, 38, 39,
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* 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 "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -18,7 +18,10 @@ ...@@ -18,7 +18,10 @@
* 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 <string.h>
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/mem.h"
static int dump_extradata(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args, static int dump_extradata(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args,
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/common.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -19,7 +19,10 @@ ...@@ -19,7 +19,10 @@
* 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 <string.h>
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
#include "avcodec.h" #include "avcodec.h"
/* parser definition */ /* parser definition */
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
*/ */
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/common.h"
#include "dsputil.h" #include "dsputil.h"
#include "dwt.h" #include "dwt.h"
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
static av_cold int decode_init(AVCodecContext *avctx) static av_cold int decode_init(AVCodecContext *avctx)
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
* http://wiki.multimedia.cx/index.php?title=Electronic_Arts_CMV * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_CMV
*/ */
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "dsputil.h" #include "dsputil.h"
#include "eaidct.h" #include "eaidct.h"
#include "libavutil/common.h"
#define ASQRT 181 /* (1/sqrt(2))<<8 */ #define ASQRT 181 /* (1/sqrt(2))<<8 */
#define A4 669 /* cos(pi/8)*sqrt(2)<<9 */ #define A4 669 /* cos(pi/8)*sqrt(2)<<9 */
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <string.h> #include <string.h>
#include "libavutil/common.h"
#include "libavutil/lfg.h" #include "libavutil/lfg.h"
#include "elbg.h" #include "elbg.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#include "dsputil.h" #include "dsputil.h"
#include "faandct.h" #include "faandct.h"
#include "libavutil/internal.h"
#include "libavutil/libm.h"
#define FLOAT float #define FLOAT float
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* 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 "faanidct.h" #include "faanidct.h"
#include "libavutil/common.h"
/* To allow switching to double. */ /* To allow switching to double. */
#define FLOAT float #define FLOAT float
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "fmtconvert.h" #include "fmtconvert.h"
#include "libavutil/common.h"
static void int32_to_float_fmul_scalar_c(float *dst, const int *src, float mul, int len){ static void int32_to_float_fmul_scalar_c(float *dst, const int *src, float mul, int len){
int i; int i;
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "g722.h" #include "g722.h"
#include "libavutil/common.h"
#define FREEZE_INTERVAL 128 #define FREEZE_INTERVAL 128
......
...@@ -19,7 +19,10 @@ ...@@ -19,7 +19,10 @@
* 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 <string.h>
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
#include "avcodec.h" #include "avcodec.h"
typedef struct H264BSFContext { typedef struct H264BSFContext {
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <stdint.h> #include <stdint.h>
#include "avcodec.h" #include "avcodec.h"
#include "h264dsp.h" #include "h264dsp.h"
#include "libavutil/common.h"
#define BIT_DEPTH 8 #define BIT_DEPTH 8
#include "h264dsp_template.c" #include "h264dsp_template.c"
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
*/ */
#include "bit_depth_template.c" #include "bit_depth_template.c"
#include "libavutil/common.h"
#ifndef AVCODEC_H264IDCT_INTERNAL_H #ifndef AVCODEC_H264IDCT_INTERNAL_H
#define AVCODEC_H264IDCT_INTERNAL_H #define AVCODEC_H264IDCT_INTERNAL_H
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#include <string.h> #include <string.h>
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/internal.h"
#define HUFFMAN_TABLE_SIZE 64 * 1024 #define HUFFMAN_TABLE_SIZE 64 * 1024
#define HUF_TOKENS 256 #define HUF_TOKENS 256
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "iirfilter.h" #include "iirfilter.h"
#include <math.h> #include <math.h>
#include "libavutil/common.h"
/** /**
* IIR filter global parameters * IIR filter global parameters
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "internal.h" #include "internal.h"
#include "imgconvert.h" #include "imgconvert.h"
#include "libavutil/colorspace.h" #include "libavutil/colorspace.h"
#include "libavutil/common.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
*/ */
#include "dsputil.h" #include "dsputil.h"
#include "libavutil/common.h"
/* /*
area positions, #3 is 1 pixel only, other are 8 pixels area positions, #3 is 1 pixel only, other are 8 pixels
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#define AVCODEC_JPEGLS_H #define AVCODEC_JPEGLS_H
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/common.h"
typedef struct JpeglsContext{ typedef struct JpeglsContext{
AVCodecContext *avctx; AVCodecContext *avctx;
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
* Kega Game Video decoder * Kega Game Video decoder
*/ */
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
#include "avcodec.h" #include "avcodec.h"
#include "lcl.h" #include "lcl.h"
#include "libavutil/internal.h"
#include "libavutil/mem.h"
#include <zlib.h> #include <zlib.h>
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "audio_frame_queue.h" #include "audio_frame_queue.h"
#include "internal.h" #include "internal.h"
#include "libavutil/audioconvert.h" #include "libavutil/audioconvert.h"
#include "libavutil/common.h"
/* libfaac has an encoder delay of 1024 samples */ /* libfaac has an encoder delay of 1024 samples */
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "audio_frame_queue.h" #include "audio_frame_queue.h"
#include "internal.h" #include "internal.h"
#include "libavutil/audioconvert.h" #include "libavutil/audioconvert.h"
#include "libavutil/common.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
typedef struct AACContext { typedef struct AACContext {
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "gsm.h" #include "gsm.h"
#include "libavutil/common.h"
static av_cold int libgsm_encode_init(AVCodecContext *avctx) { static av_cold int libgsm_encode_init(AVCodecContext *avctx) {
if (avctx->channels > 1) { if (avctx->channels > 1) {
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <ilbc.h> #include <ilbc.h>
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/common.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "internal.h" #include "internal.h"
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <lame/lame.h> #include <lame/lame.h>
#include "libavutil/audioconvert.h" #include "libavutil/audioconvert.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/common.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "audio_frame_queue.h" #include "audio_frame_queue.h"
#include "internal.h" #include "internal.h"
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <speex/speex_stereo.h> #include <speex/speex_stereo.h>
#include <speex/speex_callbacks.h> #include <speex/speex_callbacks.h>
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/common.h"
typedef struct { typedef struct {
AVFrame frame; AVFrame frame;
......
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
#include <speex/speex_stereo.h> #include <speex/speex_stereo.h>
#include "libavutil/audioconvert.h" #include "libavutil/audioconvert.h"
#include "libavutil/common.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
*/ */
/* Libav includes */ /* Libav includes */
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/base64.h" #include "libavutil/base64.h"
......
...@@ -20,8 +20,12 @@ ...@@ -20,8 +20,12 @@
*/ */
#include <vo-amrwbenc/enc_if.h> #include <vo-amrwbenc/enc_if.h>
#include <stdio.h>
#include <stdlib.h>
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/internal.h"
#include "libavutil/mem.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <vpx/vpx_decoder.h> #include <vpx/vpx_decoder.h>
#include <vpx/vp8dx.h> #include <vpx/vp8dx.h>
#include "libavutil/common.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "libavutil/base64.h" #include "libavutil/base64.h"
#include "libavutil/common.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
......
...@@ -19,7 +19,9 @@ ...@@ -19,7 +19,9 @@
* 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 "libavutil/internal.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/mem.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* 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 "libavutil/common.h"
#include "libavutil/lls.h" #include "libavutil/lls.h"
#define LPC_USE_DOUBLE #define LPC_USE_DOUBLE
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "lzw.h" #include "lzw.h"
#include "libavutil/mem.h"
#define LZW_MAXBITS 12 #define LZW_MAXBITS 12
#define LZW_SIZTABLE (1<<LZW_MAXBITS) #define LZW_SIZTABLE (1<<LZW_MAXBITS)
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/common.h"
/* /*
* Adapted to libavcodec by Francois Revol <revol@free.fr> * Adapted to libavcodec by Francois Revol <revol@free.fr>
......
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
#include "config.h" #include "config.h"
#include "dsputil.h" #include "dsputil.h"
#include "libavutil/internal.h"
#include "libavutil/lfg.h" #include "libavutil/lfg.h"
#include "libavutil/mem.h"
#include "libavutil/time.h" #include "libavutil/time.h"
#undef printf #undef printf
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
* 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 "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
* 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 "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "mpegaudiodecheader.h" #include "mpegaudiodecheader.h"
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
* 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 "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "mpegaudiodecheader.h" #include "mpegaudiodecheader.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "parser.h" #include "parser.h"
#include "mpegaudiodecheader.h" #include "mpegaudiodecheader.h"
#include "libavutil/common.h"
typedef struct MpegAudioParseContext { typedef struct MpegAudioParseContext {
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -18,7 +18,11 @@ ...@@ -18,7 +18,11 @@
* 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 <stdlib.h>
#include <string.h>
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/mem.h"
static int noise(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args, static int noise(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args,
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "libavutil/bswap.h" #include "libavutil/bswap.h"
#include "libavutil/common.h"
#include "libavutil/lzo.h" #include "libavutil/lzo.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -27,8 +27,10 @@ ...@@ -27,8 +27,10 @@
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/mem.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include <float.h> /* FLT_MIN, FLT_MAX */ #include <float.h> /* FLT_MIN, FLT_MAX */
#include <string.h>
#include "options_table.h" #include "options_table.h"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avcodec.h" #include "avcodec.h"
#include "config.h"
#define OFFSET(x) offsetof(AVCodecContext,x) #define OFFSET(x) offsetof(AVCodecContext,x)
#define DEFAULT 0 //should be NAN but it does not work as it is not a constant in glibc as required by ANSI/ISO C #define DEFAULT 0 //should be NAN but it does not work as it is not a constant in glibc as required by ANSI/ISO C
......
...@@ -20,7 +20,10 @@ ...@@ -20,7 +20,10 @@
* 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 <string.h>
#include "parser.h" #include "parser.h"
#include "libavutil/mem.h"
static AVCodecParser *av_first_parser = NULL; static AVCodecParser *av_first_parser = NULL;
......
...@@ -19,6 +19,9 @@ ...@@ -19,6 +19,9 @@
* 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 <stdlib.h>
#include <string.h>
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "avcodec.h" #include "avcodec.h"
#include "pnm.h" #include "pnm.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "libavcodec/fmtconvert.h" #include "libavcodec/fmtconvert.h"
#include "libavutil/ppc/util_altivec.h" #include "libavutil/ppc/util_altivec.h"
#include "libavutil/mem.h"
#include "dsputil_altivec.h" #include "dsputil_altivec.h"
static void int32_to_float_fmul_scalar_altivec(float *dst, const int *src, static void int32_to_float_fmul_scalar_altivec(float *dst, const int *src,
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
* 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 "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 "libavcodec/dsputil.h"
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* 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 "libavutil/mem.h"
#ifdef DEBUG #ifdef DEBUG
#define ASSERT_ALIGNED(ptr) assert(((unsigned long)ptr&0x0000000F)); #define ASSERT_ALIGNED(ptr) assert(((unsigned long)ptr&0x0000000F));
#else #else
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
*/ */
#include "libavutil/cpu.h" #include "libavutil/cpu.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/vp8dsp.h" #include "libavcodec/vp8dsp.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "proresdsp.h" #include "proresdsp.h"
#include "simple_idct.h" #include "simple_idct.h"
#include "libavutil/common.h"
#define BIAS (1 << (PRORES_BITS_PER_SAMPLE - 1)) ///< bias value for converting signed pixels into unsigned ones #define BIAS (1 << (PRORES_BITS_PER_SAMPLE - 1)) ///< bias value for converting signed pixels into unsigned ones
#define CLIP_MIN (1 << (PRORES_BITS_PER_SAMPLE - 8)) ///< minimum value for clipping resulting pixels #define CLIP_MIN (1 << (PRORES_BITS_PER_SAMPLE - 8)) ///< minimum value for clipping resulting pixels
......
...@@ -19,9 +19,12 @@ ...@@ -19,9 +19,12 @@
* 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 <string.h>
#include "avcodec.h" #include "avcodec.h"
#include "psymodel.h" #include "psymodel.h"
#include "iirfilter.h" #include "iirfilter.h"
#include "libavutil/mem.h"
extern const FFPsyModel ff_aac_psy_model; extern const FFPsyModel ff_aac_psy_model;
......
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "thread.h" #include "thread.h"
#include "libavutil/common.h"
#if HAVE_PTHREADS #if HAVE_PTHREADS
#include <pthread.h> #include <pthread.h>
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* 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 "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
* Apple QuickDraw codec. * Apple QuickDraw codec.
*/ */
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/bswap.h" #include "libavutil/bswap.h"
#include "libavutil/common.h"
static av_cold int decode_init(AVCodecContext *avctx) static av_cold int decode_init(AVCodecContext *avctx)
{ {
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "celp_filters.h" #include "celp_filters.h"
#include "ra144.h" #include "ra144.h"
#include "libavutil/common.h"
const int16_t ff_gain_val_tab[256][3] = { const int16_t ff_gain_val_tab[256][3] = {
{ 541, 956, 768}, { 877, 581, 568}, { 675,1574, 635}, {1248,1464, 668}, { 541, 956, 768}, { 877, 581, 568}, { 675,1574, 635}, {1248,1464, 668},
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <stdint.h> #include <stdint.h>
#include "dsputil.h" #include "dsputil.h"
#include "libavutil/common.h"
static const float amptable[8]={ static const float amptable[8]={
0.515625, 0.90234375, 1.57910156, 2.76342773, 0.515625, 0.90234375, 1.57910156, 2.76342773,
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "raw.h" #include "raw.h"
#include "libavutil/common.h"
const PixelFormatTag ff_raw_pix_fmt_tags[] = { const PixelFormatTag ff_raw_pix_fmt_tags[] = {
{ PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */ { PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "imgconvert.h" #include "imgconvert.h"
#include "raw.h" #include "raw.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "internal.h" #include "internal.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/internal.h"
static av_cold int raw_init_encoder(AVCodecContext *avctx) static av_cold int raw_init_encoder(AVCodecContext *avctx)
{ {
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment