diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-16 16:12:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-16 16:20:30 +0200 |
| commit | c581cb4e4fd3f8387766d3606560b2900728883a (patch) | |
| tree | ecaecc6d276510379d8e399e88937c10a778be85 | |
| parent | 208d6e6615e3c2e09de5aab92745e13da86aa827 (diff) | |
| parent | 232e35de2e139cc2d34ed67a34dedbbc5da56052 (diff) | |
| download | android_external_ffmpeg-c581cb4e4fd3f8387766d3606560b2900728883a.tar.gz android_external_ffmpeg-c581cb4e4fd3f8387766d3606560b2900728883a.tar.bz2 android_external_ffmpeg-c581cb4e4fd3f8387766d3606560b2900728883a.zip | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Fix even more missing includes after the common.h removal
build: Factor out rangecoder dependencies to CONFIG_RANGECODER
build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE
x86: avcodec: Consistently name all init files
Add more missing includes after removing the implicit common.h
Add some more missing includes after removing the implicit common.h
Don't include common.h from avutil.h
rtmp: Automatically compute the hash for SWFVerification
Conflicts:
configure
doc/APIchanges
doc/examples/decoding_encoding.c
libavcodec/Makefile
libavcodec/assdec.c
libavcodec/audio_frame_queue.c
libavcodec/avpacket.c
libavcodec/dv_profile.c
libavcodec/dwt.c
libavcodec/libtheoraenc.c
libavcodec/rawdec.c
libavcodec/rv40dsp.c
libavcodec/tiff.c
libavcodec/tiffenc.c
libavcodec/v210dec.h
libavcodec/vc1dsp.c
libavcodec/x86/Makefile
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.c
libavfilter/buffer.c
libavfilter/formats.c
libavfilter/vf_ass.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_select.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavformat/version.h
libavutil/audioconvert.c
libavutil/error.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
247 files changed, 550 insertions, 79 deletions
@@ -1365,6 +1365,7 @@ CONFIG_EXTRA=" aandcttables ac3dsp avutil + error_resilience gcrypt golomb gplv3 @@ -1379,6 +1380,7 @@ CONFIG_EXTRA=" mpegvideo mpegvideoenc nettle + rangecoder rtpdec sinewin vp3dsp @@ -1527,11 +1529,12 @@ dnxhd_encoder_select="aandcttables mpegvideoenc" dxa_decoder_select="zlib" eac3_decoder_select="ac3_decoder" eac3_encoder_select="mdct ac3dsp" -eamad_decoder_select="aandcttables" +eamad_decoder_select="aandcttables error_resilience" eatgq_decoder_select="aandcttables" -eatqi_decoder_select="aandcttables mpegvideo" +eatqi_decoder_select="aandcttables error_resilience mpegvideo" exr_decoder_select="zlib" -ffv1_decoder_select="golomb" +ffv1_decoder_select="golomb rangecoder" +ffv1_encoder_select="rangecoder" flac_decoder_select="golomb" flac_encoder_select="golomb lpc" flashsv_decoder_select="zlib" @@ -1541,15 +1544,15 @@ flashsv2_decoder_select="zlib" flv_decoder_select="h263_decoder" flv_encoder_select="h263_encoder" fraps_decoder_select="huffman" -h261_decoder_select="mpegvideo" +h261_decoder_select="error_resilience mpegvideo" h261_encoder_select="aandcttables mpegvideoenc" -h263_decoder_select="h263_parser mpegvideo" -h263_encoder_select="aandcttables mpegvideoenc" +h263_decoder_select="error_resilience h263_parser mpegvideo" +h263_encoder_select="aandcttables error_resilience mpegvideoenc" h263_vaapi_hwaccel_select="vaapi h263_decoder" h263i_decoder_select="h263_decoder" h263p_encoder_select="h263_encoder" h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser" -h264_decoder_select="golomb h264chroma h264dsp h264pred h264qpel mpegvideo" +h264_decoder_select="error_resilience golomb h264chroma h264dsp h264pred h264qpel mpegvideo" h264_dxva2_hwaccel_deps="dxva2api_h" h264_dxva2_hwaccel_select="dxva2 h264_decoder" h264_vaapi_hwaccel_select="vaapi h264_decoder" @@ -1562,7 +1565,7 @@ jpegls_decoder_select="golomb" jpegls_encoder_select="golomb" ljpeg_encoder_select="aandcttables mpegvideoenc" loco_decoder_select="golomb" -mdec_decoder_select="mpegvideo" +mdec_decoder_select="error_resilience mpegvideo" mjpeg_encoder_select="aandcttables mpegvideoenc" mlp_decoder_select="mlp_parser" mp1_decoder_select="mpegaudiodsp" @@ -1582,15 +1585,15 @@ mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h" mpeg_xvmc_decoder_select="mpegvideo_decoder" mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder" mpeg1_vdpau_hwaccel_select="vdpau mpeg1video_decoder" -mpeg1video_decoder_select="mpegvideo" -mpeg1video_encoder_select="aandcttables mpegvideoenc" +mpeg1video_decoder_select="error_resilience mpegvideo" +mpeg1video_encoder_select="aandcttables error_resilience mpegvideoenc" mpeg2_crystalhd_decoder_select="crystalhd" mpeg2_dxva2_hwaccel_deps="dxva2api_h" mpeg2_dxva2_hwaccel_select="dxva2 mpeg2video_decoder" mpeg2_vdpau_hwaccel_select="vdpau mpeg2video_decoder" mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder" -mpeg2video_decoder_select="mpegvideo" -mpeg2video_encoder_select="aandcttables mpegvideoenc" +mpeg2video_decoder_select="error_resilience mpegvideo" +mpeg2video_encoder_select="aandcttables error_resilience mpegvideoenc" mpeg4_crystalhd_decoder_select="crystalhd" mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_encoder_select="h263_encoder" @@ -1615,18 +1618,18 @@ rv10_decoder_select="h263_decoder" rv10_encoder_select="h263_encoder" rv20_decoder_select="h263_decoder" rv20_encoder_select="h263_encoder" -rv30_decoder_select="golomb h264chroma h264pred h264qpel mpegvideo" -rv40_decoder_select="golomb h264chroma h264pred h264qpel mpegvideo" +rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo" +rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo" shorten_decoder_select="golomb" sipr_decoder_select="lsp" -snow_decoder_select="dwt" -snow_encoder_select="aandcttables dwt mpegvideoenc" +snow_decoder_select="dwt rangecoder" +snow_encoder_select="aandcttables dwt error_resilience mpegvideoenc rangecoder" sonic_decoder_select="golomb" sonic_encoder_select="golomb" sonic_ls_encoder_select="golomb" -svq1_decoder_select="mpegvideo" -svq1_encoder_select="aandcttables mpegvideoenc" -svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel mpegvideo" +svq1_decoder_select="error_resilience mpegvideo" +svq1_encoder_select="aandcttables error_resilience mpegvideoenc" +svq3_decoder_select="error_resilience golomb h264chroma h264dsp h264pred h264qpel mpegvideo" svq3_decoder_suggest="zlib" theora_decoder_select="vp3_decoder" tiff_decoder_suggest="zlib" @@ -1676,10 +1679,10 @@ vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads" vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" # parsers -h264_parser_select="golomb h264dsp h264pred mpegvideo" -mpeg4video_parser_select="mpegvideo" -mpegvideo_parser_select="mpegvideo" -vc1_parser_select="mpegvideo" +h264_parser_select="error_resilience golomb h264dsp h264pred mpegvideo" +mpeg4video_parser_select="error_resilience mpegvideo" +mpegvideo_parser_select="error_resilience mpegvideo" +vc1_parser_select="error_resilience mpegvideo" # external libraries libaacplus_encoder_deps="libaacplus" diff --git a/doc/examples/decoding_encoding.c b/doc/examples/decoding_encoding.c index 919ee489b6..288432f52c 100644 --- a/doc/examples/decoding_encoding.c +++ b/doc/examples/decoding_encoding.c @@ -34,6 +34,7 @@ #include <libavutil/opt.h> #include <libavcodec/avcodec.h> #include <libavutil/audioconvert.h> +#include <libavutil/common.h> #include <libavutil/imgutils.h> #include <libavutil/mathematics.h> #include <libavutil/samplefmt.h> diff --git a/doc/protocols.texi b/doc/protocols.texi index be19239a46..c8baa13acb 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -281,6 +281,9 @@ Size of the decompressed SWF file, required for SWFVerification. @item rtmp_swfurl URL of the SWF player for the media. By default no value will be sent. +@item rtmp_swfverify +URL to player swf file, compute hash/size automatically. + @item rtmp_tcurl URL of the target stream. Defaults to proto://host[:port]/app. diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c index 1dfd553673..af07c6a4ca 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -33,7 +33,9 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c index bf2b2787cd..f41b19fd58 100644 --- a/libavcodec/8svx.c +++ b/libavcodec/8svx.c @@ -39,6 +39,7 @@ #include "libavutil/avassert.h" #include "avcodec.h" +#include "libavutil/common.h" /** decoder context */ typedef struct EightSvxContext { diff --git a/libavcodec/Makefile b/libavcodec/Makefile index ed861aeaa6..e8a57aaaa3 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -41,6 +41,7 @@ OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o OBJS-$(CONFIG_DWT) += dwt.o snow.o OBJS-$(CONFIG_DXVA2) += dxva2.o +OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o FFT-OBJS-$(CONFIG_HARDCODED_TABLES) += cos_tables.o cos_fixed_tables.o OBJS-$(CONFIG_FFT) += avfft.o fft_fixed.o fft_float.o \ $(FFT-OBJS-yes) @@ -58,6 +59,7 @@ OBJS-$(CONFIG_MPEGAUDIODSP) += mpegaudiodsp.o \ OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o mpegvideo_motion.o OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ motion_est.o ratecontrol.o +OBJS-$(CONFIG_RANGECODER) += rangecoder.o RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) OBJS-$(CONFIG_SINEWIN) += sinewin.o @@ -164,19 +166,19 @@ OBJS-$(CONFIG_EAC3_ENCODER) += eac3enc.o ac3enc.o ac3enc_float.o \ ac3tab.o ac3.o kbdwin.o eac3_data.o OBJS-$(CONFIG_EACMV_DECODER) += eacmv.o OBJS-$(CONFIG_EAMAD_DECODER) += eamad.o eaidct.o mpeg12.o \ - mpeg12data.o error_resilience.o + mpeg12data.o OBJS-$(CONFIG_EATGQ_DECODER) += eatgq.o eaidct.o OBJS-$(CONFIG_EATGV_DECODER) += eatgv.o OBJS-$(CONFIG_EATQI_DECODER) += eatqi.o eaidct.o mpeg12.o \ - mpeg12data.o error_resilience.o + mpeg12data.o OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.o OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER) += 8svx.o OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o OBJS-$(CONFIG_EXR_DECODER) += exr.o -OBJS-$(CONFIG_FFV1_DECODER) += ffv1.o rangecoder.o -OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.o rangecoder.o +OBJS-$(CONFIG_FFV1_DECODER) += ffv1.o +OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.o OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o OBJS-$(CONFIG_FFWAVESYNTH_DECODER) += ffwavesynth.o @@ -198,20 +200,18 @@ OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o OBJS-$(CONFIG_GIF_ENCODER) += gif.o lzwenc.o OBJS-$(CONFIG_GSM_DECODER) += gsmdec.o gsmdec_data.o msgsmdec.o OBJS-$(CONFIG_GSM_MS_DECODER) += gsmdec.o gsmdec_data.o msgsmdec.o -OBJS-$(CONFIG_H261_DECODER) += h261dec.o h261.o h261data.o error_resilience.o +OBJS-$(CONFIG_H261_DECODER) += h261dec.o h261.o h261data.o OBJS-$(CONFIG_H261_ENCODER) += h261enc.o h261.o h261data.o OBJS-$(CONFIG_H263_DECODER) += h263dec.o h263.o ituh263dec.o \ mpeg4video.o mpeg4videodec.o flvdec.o\ - intelh263dec.o error_resilience.o + intelh263dec.o OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += vaapi_mpeg4.o OBJS-$(CONFIG_H263_ENCODER) += mpeg4videoenc.o mpeg4video.o \ - h263.o ituh263enc.o flvenc.o \ - error_resilience.o + h263.o ituh263enc.o flvenc.o OBJS-$(CONFIG_H264_DECODER) += h264.o \ h264_loopfilter.o h264_direct.o \ cabac.o h264_sei.o h264_ps.o \ - h264_refs.o h264_cavlc.o h264_cabac.o\ - error_resilience.o + h264_refs.o h264_cavlc.o h264_cabac.o OBJS-$(CONFIG_H264_DXVA2_HWACCEL) += dxva2_h264.o OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o OBJS-$(CONFIG_H264_VDA_HWACCEL) += vda_h264.o @@ -243,8 +243,7 @@ OBJS-$(CONFIG_LJPEG_ENCODER) += ljpegenc.o mjpegenc.o mjpeg.o OBJS-$(CONFIG_LOCO_DECODER) += loco.o OBJS-$(CONFIG_MACE3_DECODER) += mace.o OBJS-$(CONFIG_MACE6_DECODER) += mace.o -OBJS-$(CONFIG_MDEC_DECODER) += mdec.o mpeg12.o mpeg12data.o \ - error_resilience.o +OBJS-$(CONFIG_MDEC_DECODER) += mdec.o mpeg12.o mpeg12data.o OBJS-$(CONFIG_MICRODVD_DECODER) += microdvddec.o ass.o OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.o @@ -288,18 +287,14 @@ OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o mpegaudiodec.o \ OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12.o mpeg12data.o \ mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o -OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12.o mpeg12data.o \ - error_resilience.o +OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12.o mpeg12data.o OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12.o \ - timecode.o \ - error_resilience.o + timecode.o OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL) += dxva2_mpeg2.o OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += vaapi_mpeg2.o -OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12.o mpeg12data.o \ - error_resilience.o +OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12.o mpeg12data.o OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12.o \ - timecode.o \ - error_resilience.o + timecode.o OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o \ @@ -380,10 +375,8 @@ OBJS-$(CONFIG_RV10_DECODER) += rv10.o OBJS-$(CONFIG_RV10_ENCODER) += rv10enc.o OBJS-$(CONFIG_RV20_DECODER) += rv10.o OBJS-$(CONFIG_RV20_ENCODER) += rv20enc.o -OBJS-$(CONFIG_RV30_DECODER) += rv30.o rv34.o rv30dsp.o rv34dsp.o \ - error_resilience.o -OBJS-$(CONFIG_RV40_DECODER) += rv40.o rv34.o rv34dsp.o rv40dsp.o \ - error_resilience.o +OBJS-$(CONFIG_RV30_DECODER) += rv30.o rv34.o rv30dsp.o rv34dsp.o +OBJS-$(CONFIG_RV40_DECODER) += rv40.o rv34.o rv34dsp.o rv40dsp.o OBJS-$(CONFIG_SAMI_DECODER) += samidec.o ass.o OBJS-$(CONFIG_S302M_DECODER) += s302m.o OBJS-$(CONFIG_SANM_DECODER) += sanm.o @@ -397,10 +390,9 @@ OBJS-$(CONFIG_SIPR_DECODER) += sipr.o acelp_pitch_delay.o \ OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o OBJS-$(CONFIG_SMACKER_DECODER) += smacker.o OBJS-$(CONFIG_SMC_DECODER) += smc.o -OBJS-$(CONFIG_SNOW_DECODER) += snowdec.o snow.o rangecoder.o -OBJS-$(CONFIG_SNOW_ENCODER) += snowenc.o snow.o rangecoder.o \ - h263.o ituh263enc.o \ - error_resilience.o +OBJS-$(CONFIG_SNOW_DECODER) += snowdec.o snow.o +OBJS-$(CONFIG_SNOW_ENCODER) += snowenc.o snow.o \ + h263.o ituh263enc.o OBJS-$(CONFIG_SOL_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_SONIC_DECODER) += sonic.o OBJS-$(CONFIG_SONIC_ENCODER) += sonic.o @@ -413,16 +405,13 @@ OBJS-$(CONFIG_SUBRIP_ENCODER) += srtenc.o ass_split.o OBJS-$(CONFIG_SUBVIEWER_DECODER) += subviewerdec.o ass.o OBJS-$(CONFIG_SUNRAST_DECODER) += sunrast.o OBJS-$(CONFIG_SUNRAST_ENCODER) += sunrastenc.o -OBJS-$(CONFIG_SVQ1_DECODER) += svq1dec.o svq1.o h263.o \ - error_resilience.o +OBJS-$(CONFIG_SVQ1_DECODER) += svq1dec.o svq1.o h263.o OBJS-$(CONFIG_SVQ1_ENCODER) += svq1enc.o svq1.o \ - h263.o ituh263enc.o \ - error_resilience.o + h263.o ituh263enc.o OBJS-$(CONFIG_SVQ3_DECODER) += h264.o svq3.o \ h264_loopfilter.o h264_direct.o \ h264_sei.o h264_ps.o h264_refs.o \ h264_cavlc.o h264_cabac.o cabac.o \ - error_resilience.o \ svq1dec.o svq1.o h263.o OBJS-$(CONFIG_TARGA_DECODER) += targa.o OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o rle.o @@ -715,27 +704,24 @@ OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264.o \ cabac.o \ h264_refs.o h264_sei.o h264_direct.o \ h264_loopfilter.o h264_cabac.o \ - h264_cavlc.o h264_ps.o \ - error_resilience.o + h264_cavlc.o h264_ps.o OBJS-$(CONFIG_AAC_LATM_PARSER) += latm_parser.o OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += mpeg4video_parser.o h263.o \ - error_resilience.o \ mpeg4videodec.o mpeg4video.o \ ituh263dec.o h263dec.o OBJS-$(CONFIG_PNG_PARSER) += png_parser.o OBJS-$(CONFIG_MPEGAUDIO_PARSER) += mpegaudio_parser.o \ mpegaudiodecheader.o mpegaudiodata.o OBJS-$(CONFIG_MPEGVIDEO_PARSER) += mpegvideo_parser.o \ - mpeg12.o mpeg12data.o \ - error_resilience.o + mpeg12.o mpeg12data.o OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o vc1.o vc1data.o \ msmpeg4.o msmpeg4data.o mpeg4video.o \ - h263.o error_resilience.o + h263.o OBJS-$(CONFIG_VORBIS_PARSER) += vorbis_parser.o xiph.o OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o OBJS-$(CONFIG_VP8_PARSER) += vp8_parser.o diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c index a18697c86b..658a8ab12b 100644 --- a/libavcodec/a64multienc.c +++ b/libavcodec/a64multienc.c @@ -29,6 +29,7 @@ #include "a64tables.h" #include "elbg.h" #include "internal.h" +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #define DITHERSTEPS 8 diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index f6c4fb2605..6f1e188c20 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "parser.h" #include "aac_ac3_parser.h" diff --git a/libavcodec/acelp_filters.c b/libavcodec/acelp_filters.c index 831d672cda..5260d0dbc5 100644 --- a/libavcodec/acelp_filters.c +++ b/libavcodec/acelp_filters.c @@ -22,6 +22,7 @@ #include <inttypes.h> +#include "libavutil/common.h" #include "avcodec.h" #include "acelp_filters.h" diff --git a/libavcodec/acelp_pitch_delay.c b/libavcodec/acelp_pitch_delay.c index 667c49ba20..48230e013c 100644 --- a/libavcodec/acelp_pitch_delay.c +++ b/libavcodec/acelp_pitch_delay.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/mathematics.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/acelp_vectors.c b/libavcodec/acelp_vectors.c index c7036477a9..704001982e 100644 --- a/libavcodec/acelp_vectors.c +++ b/libavcodec/acelp_vectors.c @@ -21,6 +21,8 @@ */ #include <inttypes.h> + +#include "libavutil/common.h" #include "avcodec.h" #include "acelp_vectors.h" #include "celp_math.h" diff --git a/libavcodec/adx.c b/libavcodec/adx.c index 1e5d89c991..870216c606 100644 --- a/libavcodec/adx.c +++ b/libavcodec/adx.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" #include "adx.h" diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 98147732ed..4a247c4a67 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -25,6 +25,7 @@ */ #include "avcodec.h" +#include "config.h" #define REGISTER_HWACCEL(X,x) { \ extern AVHWAccel ff_##x##_hwaccel; \ diff --git a/libavcodec/amr.h b/libavcodec/amr.h index 6b24002145..1ac73abe86 100644 --- a/libavcodec/amr.h +++ b/libavcodec/amr.h @@ -23,6 +23,8 @@ #ifndef AVCODEC_AMR_H #define AVCODEC_AMR_H +#include <string.h> + #include "avcodec.h" #ifdef AMR_USE_16BIT_TABLES diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index ec3bc6500e..d97cbc5ae2 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -24,6 +24,7 @@ * AMR wideband decoder */ +#include "libavutil/common.h" #include "libavutil/lfg.h" #include "avcodec.h" diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index bc7dbe7a06..7fef305cf8 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -24,6 +24,7 @@ * ASCII/ANSI art decoder */ +#include "libavutil/common.h" #include "libavutil/lfg.h" #include "avcodec.h" #include "cga_data.h" diff --git a/libavcodec/ass.c b/libavcodec/ass.c index 6f1719bc5e..6eb92f7610 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -22,6 +22,7 @@ #include "avcodec.h" #include "ass.h" #include "libavutil/avstring.h" +#include "libavutil/common.h" int ff_ass_subtitle_header(AVCodecContext *avctx, const char *font, int font_size, diff --git a/libavcodec/assdec.c b/libavcodec/assdec.c index 9709247c2d..5a51703e86 100644 --- a/libavcodec/assdec.c +++ b/libavcodec/assdec.c @@ -19,9 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + #include "avcodec.h" #include "ass.h" #include "ass_split.h" +#include "libavutil/internal.h" +#include "libavutil/mem.h" static av_cold int ass_decode_init(AVCodecContext *avctx) { diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c index d4a53da76b..779a55a1f7 100644 --- a/libavcodec/assenc.c +++ b/libavcodec/assenc.c @@ -19,8 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + #include "avcodec.h" #include "libavutil/avstring.h" +#include "libavutil/internal.h" +#include "libavutil/mem.h" static av_cold int ass_encode_init(AVCodecContext *avctx) { diff --git a/libavcodec/atrac.c b/libavcodec/atrac.c index 39f23d8559..cb2f7ba736 100644 --- a/libavcodec/atrac.c +++ b/libavcodec/atrac.c @@ -27,6 +27,7 @@ #include <math.h> #include <stddef.h> #include <stdio.h> +#include <string.h> #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/audio_frame_queue.c b/libavcodec/audio_frame_queue.c index 999aa93c6b..ec515d949a 100644 --- a/libavcodec/audio_frame_queue.c +++ b/libavcodec/audio_frame_queue.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "audio_frame_queue.h" #include "internal.h" #include "libavutil/avassert.h" diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c index 74c6600849..5d8a3485e6 100644 --- a/libavcodec/audioconvert.c +++ b/libavcodec/audioconvert.c @@ -26,6 +26,7 @@ */ #include "libavutil/avstring.h" +#include "libavutil/common.h" #include "libavutil/libm.h" #include "libavutil/samplefmt.h" #include "avcodec.h" diff --git a/libavcodec/aura.c b/libavcodec/aura.c index e16232c6e3..d79daba72c 100644 --- a/libavcodec/aura.c +++ b/libavcodec/aura.c @@ -24,6 +24,7 @@ */ #include "avcodec.h" +#include "libavutil/internal.h" typedef struct AuraDecodeContext { AVCodecContext *avctx; diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 2f82d29b8f..b0c734dcc7 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -19,10 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "internal.h" +#include <string.h> + #include "libavutil/avassert.h" -#include "bytestream.h" +#include "libavutil/mem.h" #include "avcodec.h" +#include "bytestream.h" +#include "internal.h" void av_destruct_packet_nofree(AVPacket *pkt) { diff --git a/libavcodec/bitstream_filter.c b/libavcodec/bitstream_filter.c index 7d5c9c52ff..328a9f6a34 100644 --- a/libavcodec/bitstream_filter.c +++ b/libavcodec/bitstream_filter.c @@ -18,7 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + #include "avcodec.h" +#include "libavutil/mem.h" static AVBitStreamFilter *first_bitstream_filter= NULL; diff --git a/libavcodec/cavsdsp.c b/libavcodec/cavsdsp.c index 192e0f976d..b1b0d67c05 100644 --- a/libavcodec/cavsdsp.c +++ b/libavcodec/cavsdsp.c @@ -25,6 +25,7 @@ #include <stdio.h> #include "dsputil.h" #include "cavsdsp.h" +#include "libavutil/common.h" /***************************************************************************** * diff --git a/libavcodec/celp_filters.c b/libavcodec/celp_filters.c index cf2198d325..9dac77eb4a 100644 --- a/libavcodec/celp_filters.c +++ b/libavcodec/celp_filters.c @@ -24,6 +24,7 @@ #include "avcodec.h" #include "celp_filters.h" +#include "libavutil/common.h" void ff_celp_convolve_circ(int16_t* fc_out, const int16_t* fc_in, const int16_t* filter, int len) diff --git a/libavcodec/celp_math.c b/libavcodec/celp_math.c index 090b9d8207..e9bb0d3892 100644 --- a/libavcodec/celp_math.c +++ b/libavcodec/celp_math.c @@ -27,6 +27,7 @@ #include "avcodec.h" #include "mathops.h" #include "celp_math.h" +#include "libavutil/common.h" #ifdef G729_BITEXACT /** diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index 586449849b..391e787075 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -34,6 +34,7 @@ #include <stdlib.h> #include <string.h> +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index ae099a1048..d702b7faf3 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -21,6 +21,7 @@ #include "avcodec.h" +#include "libavutil/common.h" #include "libavutil/internal.h" static const AVCodecDescriptor codec_descriptors[] = { diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index 67851a2231..bdcfdcc052 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include "avcodec.h" +#include "libavutil/common.h" #if CONFIG_ZLIB #include <zlib.h> diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index 9936b22583..e472a4016e 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -34,6 +34,7 @@ #include "avcodec.h" #include "dsputil.h" +#include "libavutil/internal.h" typedef struct CyuvDecodeContext { diff --git a/libavcodec/dct.c b/libavcodec/dct.c index 4800e13b36..2782bd96f4 100644 --- a/libavcodec/dct.c +++ b/libavcodec/dct.c @@ -28,6 +28,7 @@ */ #include <math.h> +#include <string.h> #include "libavutil/mathematics.h" #include "dct.h" diff --git a/libavcodec/dirac_parser.c b/libavcodec/dirac_parser.c index 60b2ee1f88..a7c7c328ad 100644 --- a/libavcodec/dirac_parser.c +++ b/libavcodec/dirac_parser.c @@ -27,7 +27,10 @@ * @author Marco Gerards <marco@gnu.org> */ +#include <string.h> + #include "libavutil/intreadwrite.h" +#include "libavutil/mem.h" #include "parser.h" #define DIRAC_PARSE_INFO_PREFIX 0x42424344 diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index 8cb58b3104..c3d2204838 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -21,6 +21,7 @@ #include "avcodec.h" #include "dnxhddata.h" +#include "libavutil/common.h" /* The quantization tables below are in zigzag order! */ diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c index 021a05c28a..09ab14a2e3 100644 --- a/libavcodec/dpxenc.c +++ b/libavcodec/dpxenc.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" #include "avcodec.h" diff --git a/libavcodec/dump_extradata_bsf.c b/libavcodec/dump_extradata_bsf.c index 9499d6d8d8..94b7b428bf 100644 --- a/libavcodec/dump_extradata_bsf.c +++ b/libavcodec/dump_extradata_bsf.c @@ -18,7 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + #include "avcodec.h" +#include "libavutil/mem.h" static int dump_extradata(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args, diff --git a/libavcodec/dv_profile.c b/libavcodec/dv_profile.c index 4264098912..cd06b289a3 100644 --- a/libavcodec/dv_profile.c +++ b/libavcodec/dv_profile.c @@ -18,6 +18,7 @@ #include <stdint.h> +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/pixdesc.h" diff --git a/libavcodec/dvdsub_parser.c b/libavcodec/dvdsub_parser.c index c441dad586..e50c3396e4 100644 --- a/libavcodec/dvdsub_parser.c +++ b/libavcodec/dvdsub_parser.c @@ -19,7 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + #include "libavutil/intreadwrite.h" +#include "libavutil/mem.h" #include "avcodec.h" /* parser definition */ diff --git a/libavcodec/dwt.c b/libavcodec/dwt.c index 0a9689936f..a615e07d8f 100644 --- a/libavcodec/dwt.c +++ b/libavcodec/dwt.c @@ -21,6 +21,7 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" +#include "libavutil/common.h" #include "dsputil.h" #include "dwt.h" #include "libavcodec/x86/dwt.h" diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index 79d3eb3b0e..389705eb27 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -27,6 +27,7 @@ #include <stdio.h> #include <stdlib.h> +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index d11b942ff8..83abc7253a 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -21,6 +21,7 @@ */ #include "avcodec.h" +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" static av_cold int decode_init(AVCodecContext *avctx) diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c index 76680a87ce..6b23758470 100644 --- a/libavcodec/eacmv.c +++ b/libavcodec/eacmv.c @@ -28,6 +28,7 @@ * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_CMV */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" #include "avcodec.h" diff --git a/libavcodec/eaidct.c b/libavcodec/eaidct.c index d1bc350098..175c1c47c0 100644 --- a/libavcodec/eaidct.c +++ b/libavcodec/eaidct.c @@ -27,6 +27,7 @@ #include "dsputil.h" #include "eaidct.h" +#include "libavutil/common.h" #define ASQRT 181 /* (1/sqrt(2))<<8 */ #define A4 669 /* cos(pi/8)*sqrt(2)<<9 */ diff --git a/libavcodec/elbg.c b/libavcodec/elbg.c index 4f399e7c93..18d96db1e4 100644 --- a/libavcodec/elbg.c +++ b/libavcodec/elbg.c @@ -25,6 +25,7 @@ #include <string.h> +#include "libavutil/common.h" #include "libavutil/lfg.h" #include "elbg.h" #include "avcodec.h" diff --git a/libavcodec/faandct.c b/libavcodec/faandct.c index eaf4b65f41..1379394aa9 100644 --- a/libavcodec/faandct.c +++ b/libavcodec/faandct.c @@ -27,6 +27,8 @@ #include "dsputil.h" #include "faandct.h" +#include "libavutil/internal.h" +#include "libavutil/libm.h" #define FLOAT float diff --git a/libavcodec/faanidct.c b/libavcodec/faanidct.c index dc3d8fbb81..1e9bfaf48a 100644 --- a/libavcodec/faanidct.c +++ b/libavcodec/faanidct.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "faanidct.h" +#include "libavutil/common.h" /* To allow switching to double. */ #define FLOAT float diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c index c03117c2cd..7f2dc7f038 100644 --- a/libavcodec/fmtconvert.c +++ b/libavcodec/fmtconvert.c @@ -22,6 +22,7 @@ #include "avcodec.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){ int i; diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c index da4d0a7a82..d3c72981ca 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -31,6 +31,7 @@ #include "avcodec.h" #include "internal.h" #include "g722.h" +#include "libavutil/common.h" #define FREEZE_INTERVAL 128 diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c index 3f69d7c676..2dea93301a 100644 --- a/libavcodec/h264_mp4toannexb_bsf.c +++ b/libavcodec/h264_mp4toannexb_bsf.c @@ -19,7 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + #include "libavutil/intreadwrite.h" +#include "libavutil/mem.h" #include "avcodec.h" typedef struct H264BSFContext { diff --git a/libavcodec/h264dsp.c b/libavcodec/h264dsp.c index e247677df3..ce6545ba8e 100644 --- a/libavcodec/h264dsp.c +++ b/libavcodec/h264dsp.c @@ -29,6 +29,7 @@ #include "libavutil/avassert.h" #include "avcodec.h" #include "h264dsp.h" +#include "libavutil/common.h" #define BIT_DEPTH 8 #include "h264dsp_template.c" diff --git a/libavcodec/h264idct_template.c b/libavcodec/h264idct_template.c index 5c730fdb26..313732b466 100644 --- a/libavcodec/h264idct_template.c +++ b/libavcodec/h264idct_template.c @@ -26,6 +26,7 @@ */ #include "bit_depth_template.c" +#include "libavutil/common.h" #ifndef AVCODEC_H264IDCT_INTERNAL_H #define AVCODEC_H264IDCT_INTERNAL_H diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c index 0decd0f731..26d408ff5e 100644 --- a/libavcodec/idcinvideo.c +++ b/libavcodec/idcinvideo.c @@ -49,6 +49,7 @@ #include <string.h> #include "avcodec.h" +#include "libavutil/internal.h" #define HUFFMAN_TABLE_SIZE 64 * 1024 #define HUF_TOKENS 256 diff --git a/libavcodec/iirfilter.c b/libavcodec/iirfilter.c index 4785a7c7c2..3774d6ebb7 100644 --- a/libavcodec/iirfilter.c +++ b/libavcodec/iirfilter.c @@ -26,6 +26,7 @@ #include "iirfilter.h" #include <math.h> +#include "libavutil/common.h" /** * IIR filter global parameters diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 6be366f44d..39f0fd56e1 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -35,6 +35,7 @@ #include "internal.h" #include "imgconvert.h" #include "libavutil/colorspace.h" +#include "libavutil/common.h" #include "libavutil/pixdesc.h" #include "libavutil/imgutils.h" diff --git a/libavcodec/intrax8dsp.c b/libavcodec/intrax8dsp.c index 2983f3de63..e011e2b4ad 100644 --- a/libavcodec/intrax8dsp.c +++ b/libavcodec/intrax8dsp.c @@ -22,6 +22,7 @@ */ #include "dsputil.h" +#include "libavutil/common.h" /* area positions, #3 is 1 pixel only, other are 8 pixels diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h index 2c21f774e8..88e65c906f 100644 --- a/libavcodec/jpegls.h +++ b/libavcodec/jpegls.h @@ -29,6 +29,7 @@ #define AVCODEC_JPEGLS_H #include "avcodec.h" +#include "libavutil/common.h" typedef struct JpeglsContext{ AVCodecContext *avctx; diff --git a/libavcodec/kgv1dec.c b/libavcodec/kgv1dec.c index 5c7e1539df..d416661dcd 100644 --- a/libavcodec/kgv1dec.c +++ b/libavcodec/kgv1dec.c @@ -24,6 +24,7 @@ * Kega Game Video decoder */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" #include "avcodec.h" diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c index 56b88b5707..af5d6de072 100644 --- a/libavcodec/lclenc.c +++ b/libavcodec/lclenc.c @@ -45,6 +45,8 @@ #include "avcodec.h" #include "internal.h" #include "lcl.h" +#include "libavutil/internal.h" +#include "libavutil/mem.h" #include <zlib.h> diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c index 69d362190b..0bfed1e0fc 100644 --- a/libavcodec/libfaac.c +++ b/libavcodec/libfaac.c @@ -30,6 +30,7 @@ #include "audio_frame_queue.h" #include "internal.h" #include "libavutil/audioconvert.h" +#include "libavutil/common.h" /* libfaac has an encoder delay of 1024 samples */ diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 4219dbf700..e598bd5d19 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -25,6 +25,7 @@ #include "audio_frame_queue.h" #include "internal.h" #include "libavutil/audioconvert.h" +#include "libavutil/common.h" #include "libavutil/opt.h" typedef struct AACContext { diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index 9c8635a910..97f8abe10a 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -32,6 +32,7 @@ #include "avcodec.h" #include "internal.h" #include "gsm.h" +#include "libavutil/common.h" static av_cold int libgsm_encode_close(AVCodecContext *avctx) { #if FF_API_OLD_ENCODE_AUDIO diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c index 80f1ac5688..703e1cd2e4 100644 --- a/libavcodec/libilbc.c +++ b/libavcodec/libilbc.c @@ -22,6 +22,7 @@ #include <ilbc.h> #include "avcodec.h" +#include "libavutil/common.h" #include "libavutil/opt.h" #include "internal.h" diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 6c159e235e..6b7771c0ab 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -27,6 +27,7 @@ #include <lame/lame.h> #include "libavutil/audioconvert.h" +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/opt.h" diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index cf325d03ae..8ad7090d2a 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -21,6 +21,7 @@ #include "avcodec.h" #include "libavutil/avstring.h" +#include "libavutil/common.h" #include "libavutil/opt.h" #include "audio_frame_queue.h" #include "internal.h" diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c index 2140377841..0442619efc 100644 --- a/libavcodec/libspeexdec.c +++ b/libavcodec/libspeexdec.c @@ -23,6 +23,7 @@ #include <speex/speex_stereo.h> #include <speex/speex_callbacks.h> #include "avcodec.h" +#include "libavutil/common.h" typedef struct { AVFrame frame; diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c index fd08b4d3c6..89df35b12e 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -69,6 +69,7 @@ #include <speex/speex_stereo.h> #include "libavutil/audioconvert.h" +#include "libavutil/common.h" #include "libavutil/opt.h" #include "avcodec.h" #include "internal.h" diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index 13a4d3516b..2d4ec6e7a2 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -31,6 +31,7 @@ */ /* FFmpeg includes */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/base64.h" diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c index a2f0288536..66d6905094 100644 --- a/libavcodec/libvo-amrwbenc.c +++ b/libavcodec/libvo-amrwbenc.c @@ -20,8 +20,12 @@ */ #include <vo-amrwbenc/enc_if.h> +#include <stdio.h> +#include <stdlib.h> #include "libavutil/avstring.h" +#include "libavutil/internal.h" +#include "libavutil/mem.h" #include "libavutil/opt.h" #include "avcodec.h" #include "internal.h" diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index fcacd77fd0..c0f9f36df1 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -27,6 +27,7 @@ #include <vpx/vpx_decoder.h> #include <vpx/vp8dx.h> +#include "libavutil/common.h" #include "libavutil/imgutils.h" #include "avcodec.h" diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 756a543b9d..019983f8e1 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -32,6 +32,7 @@ #include "internal.h" #include "libavutil/avassert.h" #include "libavutil/base64.h" +#include "libavutil/common.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index d5af74dfa8..45fe2acd9d 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -19,7 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/internal.h" #include "libavutil/opt.h" +#include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "avcodec.h" #include "internal.h" diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c index 4d2ae799e2..3e5e3d63ad 100644 --- a/libavcodec/lpc.c +++ b/libavcodec/lpc.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/lls.h" #define LPC_USE_DOUBLE diff --git a/libavcodec/lzw.c b/libavcodec/lzw.c index 19f3e110f4..d06e3a0ce5 100644 --- a/libavcodec/lzw.c +++ b/libavcodec/lzw.c @@ -29,6 +29,7 @@ #include "avcodec.h" #include "lzw.h" +#include "libavutil/mem.h" #define LZW_MAXBITS 12 #define LZW_SIZTABLE (1<<LZW_MAXBITS) diff --git a/libavcodec/mace.c b/libavcodec/mace.c index 8ebb6bf19d..4c7097943f 100644 --- a/libavcodec/mace.c +++ b/libavcodec/mace.c @@ -25,6 +25,7 @@ */ #include "avcodec.h" +#include "libavutil/common.h" /* * Adapted to libavcodec by Francois Revol <revol@free.fr> diff --git a/libavcodec/motion-test.c b/libavcodec/motion-test.c index ab53f19ed5..1959d38721 100644 --- a/libavcodec/motion-test.c +++ b/libavcodec/motion-test.c @@ -31,7 +31,9 @@ #include "config.h" #include "dsputil.h" +#include "libavutil/internal.h" #include "libavutil/lfg.h" +#include "libavutil/mem.h" #include "libavutil/time.h" #undef printf diff --git a/libavcodec/movsub_bsf.c b/libavcodec/movsub_bsf.c index 088c774001..a745190d36 100644 --- a/libavcodec/movsub_bsf.c +++ b/libavcodec/movsub_bsf.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/mp3_header_compress_bsf.c b/libavcodec/mp3_header_compress_bsf.c index 417a2940d5..3c5e2fb3bb 100644 --- a/libavcodec/mp3_header_compress_bsf.c +++ b/libavcodec/mp3_header_compress_bsf.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "mpegaudiodecheader.h" diff --git a/libavcodec/mp3_header_decompress_bsf.c b/libavcodec/mp3_header_decompress_bsf.c index c08aa1fa05..adf5a7f426 100644 --- a/libavcodec/mp3_header_decompress_bsf.c +++ b/libavcodec/mp3_header_decompress_bsf.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "mpegaudiodecheader.h" diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c index 2d61975d2a..afa297551c 100644 --- a/libavcodec/mpegaudio_parser.c +++ b/libavcodec/mpegaudio_parser.c @@ -22,6 +22,7 @@ #include "parser.h" #include "mpegaudiodecheader.h" +#include "libavutil/common.h" typedef struct MpegAudioParseContext { diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c index 07c52e3565..21ba7d7f8c 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -31,6 +31,7 @@ #include <stdlib.h> #include <string.h> +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/noise_bsf.c b/libavcodec/noise_bsf.c index 491fbccc1d..1cab3e1dba 100644 --- a/libavcodec/noise_bsf.c +++ b/libavcodec/noise_bsf.c @@ -18,7 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdlib.h> +#include <string.h> + #include "avcodec.h" +#include "libavutil/mem.h" static int noise(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args, diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 7e70aac375..c30ba50979 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -24,6 +24,7 @@ #include <limits.h> #include "libavutil/bswap.h" +#include "libavutil/common.h" #include "libavutil/lzo.h" #include "libavutil/imgutils.h" #include "avcodec.h" diff --git a/libavcodec/options.c b/libavcodec/options.c index 5dfc9c8241..e64bc9edf8 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -27,8 +27,10 @@ #include "avcodec.h" #include "internal.h" #include "libavutil/avassert.h" +#include "libavutil/mem.h" #include "libavutil/opt.h" #include <float.h> /* FLT_MIN, FLT_MAX */ +#include <string.h> #include "options_table.h" diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 84c3ac9b88..60e803a3be 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -27,6 +27,7 @@ #include "libavutil/opt.h" #include "avcodec.h" +#include "config.h" #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 diff --git a/libavcodec/parser.c b/libavcodec/parser.c index f081945d26..df5ecb3b87 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -20,7 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + #include "parser.h" +#include "libavutil/mem.h" static AVCodecParser *av_first_parser = NULL; diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index d1f39ca2bd..a5cf766894 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdlib.h> +#include <string.h> + #include "libavutil/imgutils.h" #include "avcodec.h" #include "pnm.h" diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index c6fdc8e592..f827a2a2f0 100644 --- a/libavcodec/ppc/dsputil_ppc.c +++ b/libavcodec/ppc/dsputil_ppc.c @@ -20,7 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + #include "libavutil/cpu.h" +#include "libavutil/mem.h" #include "libavcodec/dsputil.h" #include "dsputil_altivec.h" diff --git a/libavcodec/ppc/fmtconvert_altivec.c b/libavcodec/ppc/fmtconvert_altivec.c index 1e1a3b6865..3cb11543dd 100644 --- a/libavcodec/ppc/fmtconvert_altivec.c +++ b/libavcodec/ppc/fmtconvert_altivec.c @@ -21,6 +21,7 @@ #include "libavcodec/fmtconvert.h" #include "libavutil/ppc/util_altivec.h" +#include "libavutil/mem.h" #include "dsputil_altivec.h" static void int32_to_float_fmul_scalar_altivec(float *dst, const int *src, diff --git a/libavcodec/ppc/gmc_altivec.c b/libavcodec/ppc/gmc_altivec.c index fadf498f09..4e361214d0 100644 --- a/libavcodec/ppc/gmc_altivec.c +++ b/libavcodec/ppc/gmc_altivec.c @@ -20,6 +20,7 @@ * 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/util_altivec.h" #include "libavcodec/dsputil.h" diff --git a/libavcodec/ppc/h264_altivec_template.c b/libavcodec/ppc/h264_altivec_template.c index 2573e9c6f7..6121ea1f54 100644 --- a/libavcodec/ppc/h264_altivec_template.c +++ b/libavcodec/ppc/h264_altivec_template.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/mem.h" + #ifdef DEBUG #define ASSERT_ALIGNED(ptr) assert(((unsigned long)ptr&0x0000000F)); #else diff --git a/libavcodec/ppc/vp8dsp_altivec.c b/libavcodec/ppc/vp8dsp_altivec.c index 4c86ca5f74..14d87845dc 100644 --- a/libavcodec/ppc/vp8dsp_altivec.c +++ b/libavcodec/ppc/vp8dsp_altivec.c @@ -21,6 +21,7 @@ */ #include "libavutil/cpu.h" +#include "libavutil/mem.h" #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" #include "libavcodec/vp8dsp.h" diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c index a21003cc22..867e4030e9 100644 --- a/libavcodec/proresdsp.c +++ b/libavcodec/proresdsp.c @@ -22,6 +22,7 @@ #include "proresdsp.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 CLIP_MIN (1 << (PRORES_BITS_PER_SAMPLE - 8)) ///< minimum value for clipping resulting pixels diff --git a/libavcodec/psymodel.c b/libavcodec/psymodel.c index cc1da5018a..a4a7cbb683 100644 --- a/libavcodec/psymodel.c +++ b/libavcodec/psymodel.c @@ -19,9 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + #include "avcodec.h" #include "psymodel.h" #include "iirfilter.h" +#include "libavutil/mem.h" extern const FFPsyModel ff_aac_psy_model; diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 0d97998f13..d7ff5f6dec 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -53,6 +53,7 @@ #include "avcodec.h" #include "internal.h" #include "thread.h" +#include "libavutil/common.h" #if HAVE_PTHREADS #include <pthread.h> diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c index b49b9065de..0d6762fcfd 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" #include "avcodec.h" diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index 0bea69c755..6c61b505a5 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -24,6 +24,7 @@ * Apple QuickDraw codec. */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/r210dec.c b/libavcodec/r210dec.c index ac99522b88..f8db4a9674 100644 --- a/libavcodec/r210dec.c +++ b/libavcodec/r210dec.c @@ -22,6 +22,7 @@ #include "avcodec.h" #include "libavutil/bswap.h" +#include "libavutil/common.h" static av_cold int decode_init(AVCodecContext *avctx) { diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c index 761f595934..c54be50cc4 100644 --- a/libavcodec/ra144.c +++ b/libavcodec/ra144.c @@ -23,6 +23,7 @@ #include "avcodec.h" #include "celp_filters.h" #include "ra144.h" +#include "libavutil/common.h" const int16_t ff_gain_val_tab[256][3] = { { 541, 956, 768}, { 877, 581, 568}, { 675,1574, 635}, {1248,1464, 668}, diff --git a/libavcodec/ra288.h b/libavcodec/ra288.h index 15c9a7bc9a..0432bed485 100644 --- a/libavcodec/ra288.h +++ b/libavcodec/ra288.h @@ -24,6 +24,7 @@ #include <stdint.h> #include "dsputil.h" +#include "libavutil/common.h" static const float amptable[8]={ 0.515625, 0.90234375, 1.57910156, 2.76342773, diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 33160c4084..2cc69a6e8d 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "raw.h" +#include "libavutil/common.h" const PixelFormatTag ff_raw_pix_fmt_tags[] = { { PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */ diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index e7c83032a0..9920e7875e 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -28,6 +28,7 @@ #include "imgconvert.h" #include "raw.h" #include "libavutil/avassert.h" +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c index d03049aea8..9d61e81618 100644 --- a/libavcodec/rawenc.c +++ b/libavcodec/rawenc.c @@ -29,6 +29,7 @@ #include "internal.h" #include "libavutil/pixdesc.h" #include "libavutil/intreadwrite.h" +#include "libavutil/internal.h" static av_cold int raw_init_encoder(AVCodecContext *avctx) { diff --git a/libavcodec/resample.c b/libavcodec/resample.c index a601e7aac7..04e5aab371 100644 --- a/libavcodec/resample.c +++ b/libavcodec/resample.c @@ -24,9 +24,12 @@ * samplerate conversion for both audio and video */ +#include <string.h> + #include "avcodec.h" #include "audioconvert.h" #include "libavutil/opt.h" +#include "libavutil/mem.h" #include "libavutil/samplefmt.h" #define MAX_CHANNELS 8 diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c index f82b405bba..38186121ca 100644 --- a/libavcodec/resample2.c +++ b/libavcodec/resample2.c @@ -28,6 +28,7 @@ #include "libavutil/avassert.h" #include "avcodec.h" #include "dsputil.h" +#include "libavutil/common.h" #ifndef CONFIG_RESAMPLE_HP #define FILTER_SHIFT 15 diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c index f30cb01c1d..151b884a3b 100644 --- a/libavcodec/rl2.c +++ b/libavcodec/rl2.c @@ -30,7 +30,9 @@ #include <stdlib.h> #include <string.h> +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" +#include "libavutil/mem.h" #include "avcodec.h" diff --git a/libavcodec/rle.c b/libavcodec/rle.c index 6e468f8991..d2ec68c407 100644 --- a/libavcodec/rle.c +++ b/libavcodec/rle.c @@ -20,6 +20,7 @@ */ #include "avcodec.h" #include "rle.h" +#include "libavutil/common.h" /** * Count up to 127 consecutive pixels which are either all the same or diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c index 3944e10463..b12bf04fa2 100644 --- a/libavcodec/rpza.c +++ b/libavcodec/rpza.c @@ -38,6 +38,7 @@ #include <stdlib.h> #include <string.h> +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/rtjpeg.h b/libavcodec/rtjpeg.h index 48c84ff505..5b359db9eb 100644 --- a/libavcodec/rtjpeg.h +++ b/libavcodec/rtjpeg.h @@ -24,6 +24,7 @@ #include <stdint.h> #include "dsputil.h" +#include "libavutil/mem.h" #define RTJPEG_FILE_VERSION 0 #define RTJPEG_HEADER_SIZE 12 diff --git a/libavcodec/rv34dsp.c b/libavcodec/rv34dsp.c index 1ddcea4c0f..ac14ed9ab1 100644 --- a/libavcodec/rv34dsp.c +++ b/libavcodec/rv34dsp.c @@ -26,6 +26,7 @@ */ #include "dsputil.h" #include "rv34dsp.h" +#include "libavutil/common.h" /** * @name RV30/40 inverse transform functions diff --git a/libavcodec/rv40dsp.c b/libavcodec/rv40dsp.c index 2a39686dcd..66f53263f2 100644 --- a/libavcodec/rv40dsp.c +++ b/libavcodec/rv40dsp.c @@ -28,6 +28,7 @@ #include "dsputil.h" #include "rv34dsp.h" #include "libavutil/avassert.h" +#include "libavutil/common.h" #define RV40_LOWPASS(OPNAME, OP) \ static av_unused void OPNAME ## rv40_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\ diff --git a/libavcodec/s302m.c b/libavcodec/s302m.c index e0ae7bffbc..90406a9f0f 100644 --- a/libavcodec/s302m.c +++ b/libavcodec/s302m.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/sinewin_tablegen.h b/libavcodec/sinewin_tablegen.h index dd7d992ae1..2b9c4f2393 100644 --- a/libavcodec/sinewin_tablegen.h +++ b/libavcodec/sinewin_tablegen.h @@ -28,6 +28,7 @@ // for the host and the target and config.h is only valid for the target #include <math.h> #include "libavutil/attributes.h" +#include "libavutil/common.h" #if !CONFIG_HARDCODED_TABLES SINETABLE( 32); diff --git a/libavcodec/sipr.h b/libavcodec/sipr.h index 608636e442..8872fa326e 100644 --- a/libavcodec/sipr.h +++ b/libavcodec/sipr.h @@ -27,6 +27,7 @@ #include "avcodec.h" #include "dsputil.h" #include "acelp_pitch_delay.h" +#include "libavutil/mem.h" #define LP_FILTER_ORDER_16k 16 #define L_SUBFR_16k 80 diff --git a/libavcodec/sipr16k.c b/libavcodec/sipr16k.c index 7fb9252927..96079d93b5 100644 --- a/libavcodec/sipr16k.c +++ b/libavcodec/sipr16k.c @@ -24,6 +24,7 @@ #include <math.h> #include "sipr.h" +#include "libavutil/common.h" #include "libavutil/mathematics.h" #include "lsp.h" #include "celp_math.h" diff --git a/libavcodec/sparc/dsputil_vis.c b/libavcodec/sparc/dsputil_vis.c index 9576082535..5b5b96e60f 100644 --- a/libavcodec/sparc/dsputil_vis.c +++ b/libavcodec/sparc/dsputil_vis.c @@ -27,6 +27,7 @@ #include <inttypes.h> #include "libavcodec/dsputil.h" +#include "libavutil/mem.h" #include "dsputil_vis.h" #include "vis.h" diff --git a/libavcodec/sparc/simple_idct_vis.c b/libavcodec/sparc/simple_idct_vis.c index d98bf37651..45ca010588 100644 --- a/libavcodec/sparc/simple_idct_vis.c +++ b/libavcodec/sparc/simple_idct_vis.c @@ -22,8 +22,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "libavcodec/dsputil.h" #include "dsputil_vis.h" +#include "libavutil/mem.h" static const DECLARE_ALIGNED(8, int16_t, coeffs)[28] = { - 1259,- 1259,- 1259,- 1259, diff --git a/libavcodec/srtdec.c b/libavcodec/srtdec.c index 3d3ace0a87..f32521f771 100644 --- a/libavcodec/srtdec.c +++ b/libavcodec/srtdec.c @@ -20,6 +20,7 @@ */ #include "libavutil/avstring.h" +#include "libavutil/common.h" #include "libavutil/parseutils.h" #include "avcodec.h" #include "ass.h" diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index a8c0151cd4..7724f0fdb2 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" #include "avcodec.h" diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c index 89356b05b9..555b26e86e 100644 --- a/libavcodec/targaenc.c +++ b/libavcodec/targaenc.c @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/pixdesc.h" #include "avcodec.h" diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 65081b32ff..26401b1509 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "bytestream.h" +#include "config.h" #if CONFIG_ZLIB #include <zlib.h> #endif diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 3f2a0b6daa..883d6fb8a2 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -30,12 +30,12 @@ #include "libavutil/opt.h" #include "avcodec.h" -#include "internal.h" +#include "config.h" #if CONFIG_ZLIB #include <zlib.h> #endif -#include "libavutil/opt.h" #include "bytestream.h" +#include "internal.h" #include "tiff.h" #include "rle.h" #include "lzw.h" diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c index 438518f32f..e2397ce379 100644 --- a/libavcodec/tmv.c +++ b/libavcodec/tmv.c @@ -26,7 +26,10 @@ * @see http://www.oldskool.org/pc/8088_Corruption */ +#include <string.h> + #include "avcodec.h" +#include "libavutil/internal.h" #include "cga_data.h" diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index 15a5aaaee3..fd4a355f12 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -36,6 +36,8 @@ #include "avcodec.h" #include "dsputil.h" #include "libavutil/imgutils.h" +#include "libavutil/internal.h" +#include "libavutil/mem.h" #include "truemotion1data.h" diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c index dfad3069c8..ccac0ac9c5 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -24,6 +24,8 @@ #include "avcodec.h" #include "v210dec.h" #include "libavutil/bswap.h" +#include "libavutil/internal.h" +#include "libavutil/mem.h" #define READ_PIXELS(a, b, c) \ do { \ diff --git a/libavcodec/v210x.c b/libavcodec/v210x.c index bf37426ecd..ca847b7b39 100644 --- a/libavcodec/v210x.c +++ b/libavcodec/v210x.c @@ -20,6 +20,8 @@ #include "avcodec.h" #include "libavutil/bswap.h" +#include "libavutil/internal.h" +#include "libavutil/mem.h" static av_cold int decode_init(AVCodecContext *avctx) { diff --git a/libavcodec/v410dec.c b/libavcodec/v410dec.c index 1608ae5b30..180fcc0aea 100644 --- a/libavcodec/v410dec.c +++ b/libavcodec/v410dec.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/v410enc.c b/libavcodec/v410enc.c index 9531104597..b697b44ab4 100644 --- a/libavcodec/v410enc.c +++ b/libavcodec/v410enc.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "internal.h" diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c index d113c02267..c2b7eff278 100644 --- a/libavcodec/vc1dsp.c +++ b/libavcodec/vc1dsp.c @@ -27,6 +27,8 @@ #include "vc1dsp.h" #include "libavutil/avassert.h" +#include "libavutil/common.h" + /** Apply overlap transform to horizontal edge */ diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index 5403c1be64..cbbec53c2b 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "dsputil.h" +#include "libavutil/internal.h" typedef struct VCR1Context { AVFrame picture; diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c index b7a0b8ad51..3834416857 100644 --- a/libavcodec/vmdav.c +++ b/libavcodec/vmdav.c @@ -43,6 +43,7 @@ #include <stdlib.h> #include <string.h> +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c index 4082e02698..6d091c1bd2 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <stdlib.h> +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/vorbis_data.c b/libavcodec/vorbis_data.c index aab06b7453..f4b25fbf20 100644 --- a/libavcodec/vorbis_data.c +++ b/libavcodec/vorbis_data.c @@ -21,6 +21,7 @@ #include "dsputil.h" #include "vorbis.h" #include "libavutil/audioconvert.h" +#include "libavutil/mem.h" const uint8_t ff_vorbis_channel_layout_offsets[8][8] = { { 0 }, diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c index 4c5ff6a448..0e0c0f58ae 100644 --- a/libavcodec/vp3dsp.c +++ b/libavcodec/vp3dsp.c @@ -25,6 +25,7 @@ */ #include "libavutil/attributes.h" +#include "libavutil/common.h" #include "avcodec.h" #include "dsputil.h" #include "vp3dsp.h" diff --git a/libavcodec/vp56dsp.c b/libavcodec/vp56dsp.c index 9ab8a89411..339c3d210c 100644 --- a/libavcodec/vp56dsp.c +++ b/libavcodec/vp56dsp.c @@ -22,6 +22,7 @@ #include <stdint.h> #include "avcodec.h" #include "vp56dsp.h" +#include "libavutil/common.h" /* Gives very similar result than the vp6 version except in a few cases */ static int vp5_adjust(int v, int t) diff --git a/libavcodec/vp8dsp.c b/libavcodec/vp8dsp.c index 1ee070c78b..bacd10e25c 100644 --- a/libavcodec/vp8dsp.c +++ b/libavcodec/vp8dsp.c @@ -26,6 +26,7 @@ #include "dsputil.h" #include "vp8dsp.h" +#include "libavutil/common.h" // TODO: Maybe add dequant static void vp8_luma_dc_wht_c(DCTELEM block[4][4][16], DCTELEM dc[16]) diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c index e148a6ee92..dfa02b6954 100644 --- a/libavcodec/ws-snd1.c +++ b/libavcodec/ws-snd1.c @@ -20,6 +20,7 @@ */ #include <stdint.h> +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 0ad3457738..21eeb05bf3 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -25,9 +25,9 @@ MMX-OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o MMX-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodec_mmx.o -MMX-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp-init.o -MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp-init.o -MMX-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp-init.o +MMX-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o +MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp_init.o +MMX-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp_init.o MMX-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp_init.o MMX-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp_init.o \ x86/rv40dsp_init.o @@ -35,7 +35,7 @@ MMX-OBJS-$(CONFIG_V210_DECODER) += x86/v210-init.o MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp56dsp_init.o MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp_init.o -MMX-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp-init.o +MMX-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp_init.o YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o diff --git a/libavcodec/x86/idct_mmx_xvid.c b/libavcodec/x86/idct_mmx_xvid.c index 5d8027fb27..29286b647a 100644 --- a/libavcodec/x86/idct_mmx_xvid.c +++ b/libavcodec/x86/idct_mmx_xvid.c @@ -40,7 +40,10 @@ */ #include <inttypes.h> + +#include "config.h" #include "libavcodec/avcodec.h" +#include "libavutil/mem.h" #include "idct_xvid.h" #if HAVE_INLINE_ASM diff --git a/libavcodec/x86/idct_sse2_xvid.c b/libavcodec/x86/idct_sse2_xvid.c index 0f4f53c655..33f9de5f92 100644 --- a/libavcodec/x86/idct_sse2_xvid.c +++ b/libavcodec/x86/idct_sse2_xvid.c @@ -39,6 +39,8 @@ */ #include "libavcodec/dsputil.h" +#include "libavutil/internal.h" +#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "idct_xvid.h" #include "dsputil_mmx.h" diff --git a/libavcodec/x86/lpc_mmx.c b/libavcodec/x86/lpc_mmx.c index e0e6f8ba8a..1aac553bb0 100644 --- a/libavcodec/x86/lpc_mmx.c +++ b/libavcodec/x86/lpc_mmx.c @@ -21,6 +21,7 @@ #include "libavutil/x86/asm.h" #include "libavutil/cpu.h" +#include "libavutil/internal.h" #include "libavcodec/lpc.h" #if HAVE_INLINE_ASM diff --git a/libavcodec/x86/mlpdsp.c b/libavcodec/x86/mlpdsp.c index 0cd0e4c2fb..48c6d89e3d 100644 --- a/libavcodec/x86/mlpdsp.c +++ b/libavcodec/x86/mlpdsp.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/internal.h" #include "libavutil/x86/asm.h" #include "libavcodec/dsputil.h" #include "libavcodec/mlp.h" diff --git a/libavcodec/x86/motion_est_mmx.c b/libavcodec/x86/motion_est_mmx.c index 06da8fa9db..6bcd240200 100644 --- a/libavcodec/x86/motion_est_mmx.c +++ b/libavcodec/x86/motion_est_mmx.c @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/internal.h" +#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavcodec/dsputil.h" #include "dsputil_mmx.h" diff --git a/libavcodec/x86/pngdsp-init.c b/libavcodec/x86/pngdsp_init.c index 7a12730620..7a12730620 100644 --- a/libavcodec/x86/pngdsp-init.c +++ b/libavcodec/x86/pngdsp_init.c diff --git a/libavcodec/x86/proresdsp-init.c b/libavcodec/x86/proresdsp_init.c index c4aeb7f503..a99a938de2 100644 --- a/libavcodec/x86/proresdsp-init.c +++ b/libavcodec/x86/proresdsp_init.c @@ -3,20 +3,20 @@ * * Copyright (c) 2010-2011 Maxim Poliakovski * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c index c508ac9328..1c193076b0 100644 --- a/libavcodec/x86/rv40dsp_init.c +++ b/libavcodec/x86/rv40dsp_init.c @@ -27,6 +27,7 @@ */ #include "libavcodec/rv34dsp.h" +#include "libavutil/mem.h" #include "dsputil_mmx.h" void ff_put_rv40_chroma_mc8_mmx (uint8_t *dst, uint8_t *src, diff --git a/libavcodec/x86/simple_idct_mmx.c b/libavcodec/x86/simple_idct_mmx.c index 20e51a47f4..314aca6c86 100644 --- a/libavcodec/x86/simple_idct_mmx.c +++ b/libavcodec/x86/simple_idct_mmx.c @@ -21,6 +21,8 @@ */ #include "libavcodec/dsputil.h" #include "libavcodec/simple_idct.h" +#include "libavutil/internal.h" +#include "libavutil/mem.h" #include "dsputil_mmx.h" #if HAVE_INLINE_ASM diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index 8b490b6204..9ea6042e4e 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -25,6 +25,8 @@ */ #include "libavutil/cpu.h" +#include "libavutil/internal.h" +#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavcodec/dsputil.h" #include "dsputil_mmx.h" diff --git a/libavcodec/x86/vp8dsp-init.c b/libavcodec/x86/vp8dsp_init.c index 0dc6ba9f2c..a7e351ad9a 100644 --- a/libavcodec/x86/vp8dsp-init.c +++ b/libavcodec/x86/vp8dsp_init.c @@ -21,6 +21,7 @@ */ #include "libavutil/cpu.h" +#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavcodec/vp8dsp.h" diff --git a/libavcodec/xbmenc.c b/libavcodec/xbmenc.c index bcdfb2d986..a82ceaaaf9 100644 --- a/libavcodec/xbmenc.c +++ b/libavcodec/xbmenc.c @@ -22,6 +22,7 @@ #include "avcodec.h" #include "internal.h" +#include "libavutil/common.h" static av_cold int xbm_encode_init(AVCodecContext *avctx) { diff --git a/libavcodec/xl.c b/libavcodec/xl.c index 11db4982bb..b0f6e939ba 100644 --- a/libavcodec/xl.c +++ b/libavcodec/xl.c @@ -24,6 +24,7 @@ * Miro VideoXL codec. */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c index c8c2453a56..789181cb1c 100644 --- a/libavcodec/zerocodec.c +++ b/libavcodec/zerocodec.c @@ -19,6 +19,7 @@ #include <zlib.h> #include "avcodec.h" +#include "libavutil/common.h" typedef struct { AVFrame previous_frame; diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 6ccee39855..0a4f1cdd6c 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -27,6 +27,7 @@ #include <stdio.h> #include <stdlib.h> +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c index 117d25fb8f..df5b90f1ce 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -27,6 +27,7 @@ #include <stdio.h> #include <stdlib.h> +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "internal.h" diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 73e7c716cf..b9b18f2576 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -18,6 +18,7 @@ #include "libavutil/avassert.h" #include "avdevice.h" +#include "config.h" unsigned avdevice_version(void) { diff --git a/libavdevice/timefilter.c b/libavdevice/timefilter.c index a423fc0859..f05792ebc3 100644 --- a/libavdevice/timefilter.c +++ b/libavdevice/timefilter.c @@ -22,6 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/mem.h" #include "config.h" #include "timefilter.h" diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c index 6cf89ace2a..1ed1634e83 100644 --- a/libavfilter/af_aformat.c +++ b/libavfilter/af_aformat.c @@ -25,6 +25,7 @@ #include "libavutil/audioconvert.h" #include "libavutil/avstring.h" +#include "libavutil/common.h" #include "libavutil/opt.h" #include "audio.h" diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index dd5dfa91b3..9e14bcf6e8 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -32,6 +32,7 @@ #include "libavutil/audio_fifo.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/common.h" #include "libavutil/float_dsp.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" diff --git a/libavfilter/af_anull.c b/libavfilter/af_anull.c index 0bf846d534..355dff637c 100644 --- a/libavfilter/af_anull.c +++ b/libavfilter/af_anull.c @@ -25,6 +25,7 @@ #include "audio.h" #include "avfilter.h" #include "internal.h" +#include "libavutil/internal.h" AVFilter avfilter_af_anull = { .name = "anull", diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c index 0fe4570896..526779024d 100644 --- a/libavfilter/af_asyncts.c +++ b/libavfilter/af_asyncts.c @@ -18,6 +18,7 @@ #include "libavresample/avresample.h" #include "libavutil/audio_fifo.h" +#include "libavutil/common.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/samplefmt.h" diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index 170fad68f6..0cb1c1928f 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -27,6 +27,7 @@ #include "libavutil/audioconvert.h" #include "libavutil/avstring.h" +#include "libavutil/common.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/samplefmt.h" diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c index d15c781bf5..76dd835b30 100644 --- a/libavfilter/af_channelsplit.c +++ b/libavfilter/af_channelsplit.c @@ -24,6 +24,7 @@ */ #include "libavutil/audioconvert.h" +#include "libavutil/internal.h" #include "libavutil/opt.h" #include "audio.h" diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index 37bad9c7ea..902cacdbed 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -27,6 +27,7 @@ #include "libavutil/audioconvert.h" #include "libavutil/avassert.h" +#include "libavutil/common.h" #include "libavutil/opt.h" #include "audio.h" diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c index 1360c1ca49..eb2d2f9e21 100644 --- a/libavfilter/af_resample.c +++ b/libavfilter/af_resample.c @@ -24,6 +24,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/common.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 2949a4c1ae..7b66452f3c 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -20,6 +20,7 @@ */ #include "avfilter.h" +#include "config.h" #define REGISTER_FILTER(X,x,y) { \ diff --git a/libavfilter/asink_anullsink.c b/libavfilter/asink_anullsink.c index d9e3e5a0cd..506619bf1a 100644 --- a/libavfilter/asink_anullsink.c +++ b/libavfilter/asink_anullsink.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/internal.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c index 008cb2a01b..682be7ed11 100644 --- a/libavfilter/asrc_anullsrc.c +++ b/libavfilter/asrc_anullsrc.c @@ -24,14 +24,17 @@ * null audio source */ -#include "internal.h" -#include "libavutil/audioconvert.h" -#include "libavutil/opt.h" +#include <inttypes.h> +#include <stdio.h> #include "audio.h" #include "avfilter.h" #include "internal.h" +#include "libavutil/audioconvert.h" +#include "libavutil/internal.h" +#include "libavutil/opt.h" + typedef struct { const AVClass *class; char *channel_layout_str; diff --git a/libavfilter/audio.c b/libavfilter/audio.c index 44d3ab75a6..aa87488f5f 100644 --- a/libavfilter/audio.c +++ b/libavfilter/audio.c @@ -21,6 +21,7 @@ #include "libavutil/avassert.h" #include "libavutil/audioconvert.h" +#include "libavutil/common.h" #include "audio.h" #include "avfilter.h" diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index e87a78abe9..b1df5373b3 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/pixdesc.h" #include "libavutil/rational.h" #include "libavutil/audioconvert.h" diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index a5517fc5e0..8a5f106886 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -34,6 +34,7 @@ #include "libavutil/audioconvert.h" #include "libavutil/avassert.h" +#include "libavutil/common.h" #include "libavutil/log.h" static const AVClass filtergraph_class = { diff --git a/libavfilter/buffer.c b/libavfilter/buffer.c index 30663b5a70..3431c91ac0 100644 --- a/libavfilter/buffer.c +++ b/libavfilter/buffer.c @@ -22,6 +22,7 @@ #include "libavutil/audioconvert.h" #include "libavutil/avassert.h" +#include "libavutil/common.h" #include "libavutil/imgutils.h" #include "libavcodec/avcodec.h" diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index e00af7c151..d68689051f 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -26,6 +26,7 @@ #include "libavutil/audio_fifo.h" #include "libavutil/audioconvert.h" #include "libavutil/avassert.h" +#include "libavutil/common.h" #include "libavutil/mathematics.h" #include "audio.h" diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 6803b69500..c5e3518f8e 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -32,6 +32,7 @@ #include "avcodec.h" #include "libavutil/audioconvert.h" +#include "libavutil/common.h" #include "libavutil/fifo.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index 0a6435a299..08b26592bc 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -19,8 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + #include "libavutil/avutil.h" #include "libavutil/colorspace.h" +#include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "drawutils.h" #include "formats.h" diff --git a/libavfilter/f_settb.c b/libavfilter/f_settb.c index 3430e70b6c..e6c16aa2f9 100644 --- a/libavfilter/f_settb.c +++ b/libavfilter/f_settb.c @@ -23,8 +23,12 @@ * Set timebase for the output link. */ +#include <inttypes.h> +#include <stdio.h> + #include "libavutil/avstring.h" #include "libavutil/eval.h" +#include "libavutil/internal.h" #include "libavutil/mathematics.h" #include "libavutil/rational.h" #include "avfilter.h" diff --git a/libavfilter/fifo.c b/libavfilter/fifo.c index 4e0e87f83d..57b3e79e4b 100644 --- a/libavfilter/fifo.c +++ b/libavfilter/fifo.c @@ -25,6 +25,7 @@ #include "libavutil/avassert.h" #include "libavutil/audioconvert.h" +#include "libavutil/common.h" #include "libavutil/mathematics.h" #include "libavutil/samplefmt.h" diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 62facc6634..735f21b119 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/eval.h" #include "libavutil/pixdesc.h" #include "libavutil/parseutils.h" diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index beaae9375c..c34651f131 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -22,8 +22,10 @@ #include <ctype.h> #include <string.h> +#include <stdio.h> #include "libavutil/avstring.h" +#include "libavutil/mem.h" #include "avfilter.h" #include "avfiltergraph.h" diff --git a/libavfilter/split.c b/libavfilter/split.c index 85377c1f31..ac6939e35d 100644 --- a/libavfilter/split.c +++ b/libavfilter/split.c @@ -23,6 +23,10 @@ * audio and video splitter */ +#include <stdio.h> + +#include "libavutil/internal.h" +#include "libavutil/mem.h" #include "avfilter.h" #include "audio.h" #include "internal.h" diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index e4ca5d5484..1d0c22b600 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -23,6 +23,7 @@ * aspect ratio modification video filters */ +#include "libavutil/common.h" #include "libavutil/mathematics.h" #include "libavutil/parseutils.h" #include "avfilter.h" diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c index 16b2870d5e..5064040735 100644 --- a/libavfilter/vf_blackframe.c +++ b/libavfilter/vf_blackframe.c @@ -27,6 +27,10 @@ * Ported from MPlayer libmpcodecs/vf_blackframe.c. */ +#include <stdio.h> +#include <inttypes.h> + +#include "libavutil/internal.h" #include "avfilter.h" #include "internal.h" #include "formats.h" diff --git a/libavfilter/vf_boxblur.c b/libavfilter/vf_boxblur.c index e98e90aba6..904052970c 100644 --- a/libavfilter/vf_boxblur.c +++ b/libavfilter/vf_boxblur.c @@ -26,6 +26,7 @@ */ #include "libavutil/avstring.h" +#include "libavutil/common.h" #include "libavutil/eval.h" #include "libavutil/pixdesc.h" #include "avfilter.h" diff --git a/libavfilter/vf_copy.c b/libavfilter/vf_copy.c index 399249283a..d62108ad19 100644 --- a/libavfilter/vf_copy.c +++ b/libavfilter/vf_copy.c @@ -21,6 +21,7 @@ * copy video filter */ +#include "libavutil/internal.h" #include "avfilter.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index 4d3a7f355a..4e794df91e 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -25,12 +25,15 @@ /* #define DEBUG */ +#include <stdio.h> + #include "avfilter.h" #include "formats.h" #include "internal.h" #include "video.h" #include "libavutil/eval.h" #include "libavutil/avstring.h" +#include "libavutil/internal.h" #include "libavutil/libm.h" #include "libavutil/imgutils.h" #include "libavutil/mathematics.h" diff --git a/libavfilter/vf_cropdetect.c b/libavfilter/vf_cropdetect.c index b245d6e12b..bed4bfdd47 100644 --- a/libavfilter/vf_cropdetect.c +++ b/libavfilter/vf_cropdetect.c @@ -23,7 +23,10 @@ * Ported from MPlayer libmpcodecs/vf_cropdetect.c. */ +#include <stdio.h> + #include "libavutil/imgutils.h" +#include "libavutil/internal.h" #include "avfilter.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c index a80b1fe571..0c17d54b6a 100644 --- a/libavfilter/vf_delogo.c +++ b/libavfilter/vf_delogo.c @@ -25,6 +25,7 @@ * Ported from MPlayer libmpcodecs/vf_delogo.c. */ +#include "libavutil/common.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c index 8be8b14a05..2e02be4756 100644 --- a/libavfilter/vf_drawbox.c +++ b/libavfilter/vf_drawbox.c @@ -25,6 +25,7 @@ */ #include "libavutil/colorspace.h" +#include "libavutil/common.h" #include "libavutil/pixdesc.h" #include "libavutil/parseutils.h" #include "avfilter.h" diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 0f7564d383..52da50da0c 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -31,6 +31,7 @@ #include "config.h" #include "libavutil/avstring.h" +#include "libavutil/common.h" #include "libavutil/file.h" #include "libavutil/eval.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c index 6d68357e6a..cd93f9bf6b 100644 --- a/libavfilter/vf_fade.c +++ b/libavfilter/vf_fade.c @@ -26,6 +26,7 @@ */ #include "libavutil/avstring.h" +#include "libavutil/common.h" #include "libavutil/eval.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c index 6573ac8d77..e012b29def 100644 --- a/libavfilter/vf_fieldorder.c +++ b/libavfilter/vf_fieldorder.c @@ -25,7 +25,11 @@ /* #define DEBUG */ +#include <stdio.h> +#include <string.h> + #include "libavutil/imgutils.h" +#include "libavutil/internal.h" #include "libavutil/pixdesc.h" #include "avfilter.h" #include "formats.h" diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index 1a76183e18..ccd829f13c 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -23,6 +23,10 @@ * format and noformat video filters */ +#include <string.h> + +#include "libavutil/internal.h" +#include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index 09b7393fe2..86e173bafc 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -25,6 +25,7 @@ * a filter enforcing given constant framerate */ +#include "libavutil/common.h" #include "libavutil/fifo.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c index 64d75b2437..5c49060c9d 100644 --- a/libavfilter/vf_gradfun.c +++ b/libavfilter/vf_gradfun.c @@ -33,6 +33,7 @@ */ #include "libavutil/imgutils.h" +#include "libavutil/common.h" #include "libavutil/cpu.h" #include "libavutil/pixdesc.h" #include "avfilter.h" diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c index 413c5668f1..eada9a03ac 100644 --- a/libavfilter/vf_hflip.c +++ b/libavfilter/vf_hflip.c @@ -24,11 +24,14 @@ * horizontal flip filter */ +#include <string.h> + #include "avfilter.h" #include "formats.h" #include "internal.h" #include "video.h" #include "libavutil/pixdesc.h" +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c index c88ce0d169..c7cef44860 100644 --- a/libavfilter/vf_hqdn3d.c +++ b/libavfilter/vf_hqdn3d.c @@ -26,6 +26,7 @@ * libmpcodecs/vf_hqdn3d.c. */ +#include "libavutil/common.h" #include "libavutil/pixdesc.h" #include "libavutil/intreadwrite.h" #include "avfilter.h" diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index a9b9e8aaec..3fd8d42bcd 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -24,6 +24,7 @@ * value, and apply it to input video. */ +#include "libavutil/common.h" #include "libavutil/eval.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_null.c b/libavfilter/vf_null.c index 5c4704e9a9..9ab2767e8d 100644 --- a/libavfilter/vf_null.c +++ b/libavfilter/vf_null.c @@ -21,6 +21,7 @@ * null video filter */ +#include "libavutil/internal.h" #include "avfilter.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index afe45b57ce..f09f335f95 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -29,6 +29,7 @@ #include "avfilter.h" #include "formats.h" +#include "libavutil/common.h" #include "libavutil/eval.h" #include "libavutil/avstring.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index 3e9dfa2680..7d2ea92a7f 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -29,6 +29,7 @@ #include "internal.h" #include "video.h" #include "libavutil/avstring.h" +#include "libavutil/common.h" #include "libavutil/eval.h" #include "libavutil/pixdesc.h" #include "libavutil/colorspace.h" diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c index 2e09d8c6a7..f8c54327ad 100644 --- a/libavfilter/vf_pixdesctest.c +++ b/libavfilter/vf_pixdesctest.c @@ -23,6 +23,7 @@ * pixdesc test filter */ +#include "libavutil/common.h" #include "libavutil/pixdesc.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 143ff70951..eda1b1fe1a 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -23,12 +23,16 @@ * scale video filter */ +#include <stdio.h> +#include <string.h> + #include "avfilter.h" #include "formats.h" #include "internal.h" #include "video.h" #include "libavutil/avstring.h" #include "libavutil/eval.h" +#include "libavutil/internal.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_select.c b/libavfilter/vf_select.c index 4d19b33913..db1b038069 100644 --- a/libavfilter/vf_select.c +++ b/libavfilter/vf_select.c @@ -26,6 +26,7 @@ #include "libavutil/eval.h" #include "libavutil/fifo.h" #include "libavcodec/dsputil.h" +#include "libavutil/internal.h" #include "avfilter.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/vf_setpts.c b/libavfilter/vf_setpts.c index 0f2382ae76..62ac9ab87c 100644 --- a/libavfilter/vf_setpts.c +++ b/libavfilter/vf_setpts.c @@ -27,6 +27,7 @@ /* #define DEBUG */ #include "libavutil/eval.h" +#include "libavutil/internal.h" #include "libavutil/mathematics.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index fd9ea69f99..9d20b4831f 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -24,6 +24,7 @@ #include "libavutil/adler32.h" #include "libavutil/imgutils.h" +#include "libavutil/internal.h" #include "libavutil/pixdesc.h" #include "libavutil/timestamp.h" #include "avfilter.h" diff --git a/libavfilter/vf_slicify.c b/libavfilter/vf_slicify.c index e7679a0527..347943098b 100644 --- a/libavfilter/vf_slicify.c +++ b/libavfilter/vf_slicify.c @@ -26,6 +26,7 @@ #include "avfilter.h" #include "internal.h" #include "video.h" +#include "libavutil/common.h" #include "libavutil/pixdesc.h" typedef struct { diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index 3a17d6d4ad..546f149e5b 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -25,9 +25,12 @@ * Based on MPlayer libmpcodecs/vf_rotate.c. */ +#include <stdio.h> + #include "libavutil/intreadwrite.h" #include "libavutil/pixdesc.h" #include "libavutil/imgutils.h" +#include "libavutil/internal.h" #include "avfilter.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/vf_vflip.c b/libavfilter/vf_vflip.c index 3c06abaac9..686cd8f357 100644 --- a/libavfilter/vf_vflip.c +++ b/libavfilter/vf_vflip.c @@ -23,6 +23,7 @@ * video vertical flip filter */ +#include "libavutil/internal.h" #include "libavutil/pixdesc.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/video.c b/libavfilter/video.c index b7a8b86dad..d04505c854 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -20,8 +20,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> +#include <stdio.h> + #include "libavutil/avassert.h" #include "libavutil/imgutils.h" +#include "libavutil/mem.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/vsink_nullsink.c b/libavfilter/vsink_nullsink.c index f6c0460e8a..b5aae21f77 100644 --- a/libavfilter/vsink_nullsink.c +++ b/libavfilter/vsink_nullsink.c @@ -18,6 +18,7 @@ #include "avfilter.h" #include "internal.h" +#include "libavutil/internal.h" static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref) { diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index 9640faeb88..08129b234c 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -35,6 +35,7 @@ #include <float.h> +#include "libavutil/common.h" #include "libavutil/opt.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" diff --git a/libavfilter/x86/gradfun.c b/libavfilter/x86/gradfun.c index e5b4ff17ac..a7bde02755 100644 --- a/libavfilter/x86/gradfun.c +++ b/libavfilter/x86/gradfun.c @@ -20,6 +20,7 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" +#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavfilter/gradfun.h" diff --git a/libavfilter/x86/yadif.c b/libavfilter/x86/yadif.c index a62f0dfbc5..81855d0b51 100644 --- a/libavfilter/x86/yadif.c +++ b/libavfilter/x86/yadif.c @@ -20,6 +20,8 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" +#include "libavutil/internal.h" +#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavcodec/x86/dsputil_mmx.h" #include "libavfilter/yadif.h" diff --git a/libavformat/network.c b/libavformat/network.c index 6b4cb570b3..0e79cae7bf 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -21,6 +21,7 @@ #include "libavutil/avutil.h" #include "network.h" #include "libavcodec/internal.h" +#include "libavutil/mem.h" #define THREADS (HAVE_PTHREADS || (defined(WIN32) && !defined(__MINGW32CE__))) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index e3bcf3d843..9520b409e8 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -41,6 +41,10 @@ #include "rtmppkt.h" #include "url.h" +#if CONFIG_ZLIB +#include <zlib.h> +#endif + //#define DEBUG #define APP_MAX_LENGTH 128 @@ -95,6 +99,7 @@ typedef struct RTMPContext { int swfhash_len; ///< length of the SHA256 hash int swfsize; ///< size of the decompressed SWF file char* swfurl; ///< url of the swf player + char* swfverify; ///< URL to player swf file, compute hash/size automatically char swfverification[42]; ///< hash of the SWF verification char* pageurl; ///< url of the web page char* subscribe; ///< name of live stream to subscribe @@ -825,6 +830,129 @@ static int rtmp_calc_swf_verification(URLContext *s, RTMPContext *rt, return 0; } +#if CONFIG_ZLIB +static int rtmp_uncompress_swfplayer(uint8_t *in_data, int64_t in_size, + uint8_t **out_data, int64_t *out_size) +{ + z_stream zs = { 0 }; + void *ptr; + int size; + int ret = 0; + + zs.avail_in = in_size; + zs.next_in = in_data; + ret = inflateInit(&zs); + if (ret != Z_OK) + return AVERROR_UNKNOWN; + + do { + uint8_t tmp_buf[16384]; + + zs.avail_out = sizeof(tmp_buf); + zs.next_out = tmp_buf; + + ret = inflate(&zs, Z_NO_FLUSH); + if (ret != Z_OK && ret != Z_STREAM_END) { + ret = AVERROR_UNKNOWN; + goto fail; + } + + size = sizeof(tmp_buf) - zs.avail_out; + if (!(ptr = av_realloc(*out_data, *out_size + size))) { + ret = AVERROR(ENOMEM); + goto fail; + } + *out_data = ptr; + + memcpy(*out_data + *out_size, tmp_buf, size); + *out_size += size; + } while (zs.avail_out == 0); + +fail: + inflateEnd(&zs); + return ret; +} +#endif + +static int rtmp_calc_swfhash(URLContext *s) +{ + RTMPContext *rt = s->priv_data; + uint8_t *in_data = NULL, *out_data = NULL, *swfdata; + int64_t in_size, out_size; + URLContext *stream; + char swfhash[32]; + int swfsize; + int ret = 0; + + /* Get the SWF player file. */ + if ((ret = ffurl_open(&stream, rt->swfverify, AVIO_FLAG_READ, + &s->interrupt_callback, NULL)) < 0) { + av_log(s, AV_LOG_ERROR, "Cannot open connection %s.\n", rt->swfverify); + goto fail; + } + + if ((in_size = ffurl_seek(stream, 0, AVSEEK_SIZE)) < 0) { + ret = AVERROR(EIO); + goto fail; + } + + if (!(in_data = av_malloc(in_size))) { + ret = AVERROR(ENOMEM); + goto fail; + } + + if ((ret = ffurl_read_complete(stream, in_data, in_size)) < 0) + goto fail; + + if (in_size < 3) { + ret = AVERROR_INVALIDDATA; + goto fail; + } + + if (!memcmp(in_data, "CWS", 3)) { + /* Decompress the SWF player file using Zlib. */ + if (!(out_data = av_malloc(8))) { + ret = AVERROR(ENOMEM); + goto fail; + } + *in_data = 'F'; // magic stuff + memcpy(out_data, in_data, 8); + out_size = 8; + +#if CONFIG_ZLIB + if ((ret = rtmp_uncompress_swfplayer(in_data + 8, in_size - 8, + &out_data, &out_size)) < 0) + goto fail; +#else + av_log(s, AV_LOG_ERROR, + "Zlib is required for decompressing the SWF player file.\n"); + ret = AVERROR(EINVAL); + goto fail; +#endif + swfsize = out_size; + swfdata = out_data; + } else { + swfsize = in_size; + swfdata = in_data; + } + + /* Compute the SHA256 hash of the SWF player file. */ + if ((ret = ff_rtmp_calc_digest(swfdata, swfsize, 0, + "Genuine Adobe Flash Player 001", 30, + swfhash)) < 0) + goto fail; + + /* Set SWFVerification parameters. */ + av_opt_set_bin(rt, "rtmp_swfhash", swfhash, 32, 0); + rt->swfsize = swfsize; + +fail: + av_freep(&in_data); + av_freep(&out_data); + ffurl_close(stream); + return ret; +} + /** * Perform handshake with the server by means of exchanging pseudorandom data * signed with HMAC-SHA2 digest. @@ -1492,6 +1620,11 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) goto fail; } + if (rt->swfverify) { + if ((ret = rtmp_calc_swfhash(s)) < 0) + goto fail; + } + rt->state = STATE_START; if ((ret = rtmp_handshake(s, rt)) < 0) goto fail; @@ -1784,6 +1917,7 @@ static const AVOption rtmp_options[] = { {"rtmp_swfhash", "SHA256 hash of the decompressed SWF file (32 bytes).", OFFSET(swfhash), AV_OPT_TYPE_BINARY, .flags = DEC}, {"rtmp_swfsize", "Size of the decompressed SWF file, required for SWFVerification.", OFFSET(swfsize), AV_OPT_TYPE_INT, {0}, 0, INT_MAX, DEC}, {"rtmp_swfurl", "URL of the SWF player. By default no value will be sent", OFFSET(swfurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, + {"rtmp_swfverify", "URL to player swf file, compute hash/size automatically.", OFFSET(swfverify), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC}, {"rtmp_tcurl", "URL of the target stream. Defaults to proto://host[:port]/app.", OFFSET(tcurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, { NULL }, }; diff --git a/libavformat/version.h b/libavformat/version.h index d89b346c1d..3703903eb2 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MINOR 24 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ diff --git a/libavresample/audio_convert.c b/libavresample/audio_convert.c index 200eb100cc..1138ef8877 100644 --- a/libavresample/audio_convert.c +++ b/libavresample/audio_convert.c @@ -22,6 +22,7 @@ #include <stdint.h> #include "config.h" +#include "libavutil/common.h" #include "libavutil/libm.h" #include "libavutil/log.h" #include "libavutil/mem.h" diff --git a/libavresample/audio_data.c b/libavresample/audio_data.c index 3f82c50ef0..d624ad3796 100644 --- a/libavresample/audio_data.c +++ b/libavresample/audio_data.c @@ -19,6 +19,7 @@ */ #include <stdint.h> +#include <string.h> #include "libavutil/mem.h" #include "audio_data.h" diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c index f948c82788..dd2f33d27f 100644 --- a/libavresample/audio_mix.c +++ b/libavresample/audio_mix.c @@ -20,6 +20,7 @@ #include <stdint.h> +#include "libavutil/common.h" #include "libavutil/libm.h" #include "libavutil/samplefmt.h" #include "avresample.h" diff --git a/libavresample/audio_mix_matrix.c b/libavresample/audio_mix_matrix.c index 522a177f20..3fbc4a4264 100644 --- a/libavresample/audio_mix_matrix.c +++ b/libavresample/audio_mix_matrix.c @@ -21,6 +21,7 @@ #include <stdint.h> +#include "libavutil/common.h" #include "libavutil/libm.h" #include "libavutil/samplefmt.h" #include "avresample.h" diff --git a/libavresample/avresample-test.c b/libavresample/avresample-test.c index ad2f16d6f6..0d4f2df37c 100644 --- a/libavresample/avresample-test.c +++ b/libavresample/avresample-test.c @@ -23,6 +23,7 @@ #include <stdio.h> #include "libavutil/avstring.h" +#include "libavutil/common.h" #include "libavutil/lfg.h" #include "libavutil/libm.h" #include "libavutil/log.h" diff --git a/libavresample/options.c b/libavresample/options.c index e7e0c27c4d..53076f4b3a 100644 --- a/libavresample/options.c +++ b/libavresample/options.c @@ -19,6 +19,7 @@ */ #include "libavutil/mathematics.h" +#include "libavutil/mem.h" #include "libavutil/opt.h" #include "avresample.h" #include "internal.h" diff --git a/libavresample/resample.c b/libavresample/resample.c index e6e0892c10..f0af1ffd58 100644 --- a/libavresample/resample.c +++ b/libavresample/resample.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/libm.h" #include "libavutil/log.h" #include "internal.h" diff --git a/libavresample/utils.c b/libavresample/utils.c index 7588111003..81292930d4 100644 --- a/libavresample/utils.c +++ b/libavresample/utils.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/dict.h" // #include "libavutil/error.h" #include "libavutil/log.h" diff --git a/libavutil/audio_fifo.c b/libavutil/audio_fifo.c index 97c51a72c1..b562537cf6 100644 --- a/libavutil/audio_fifo.c +++ b/libavutil/audio_fifo.c @@ -26,6 +26,7 @@ #include "avutil.h" #include "audio_fifo.h" +#include "common.h" #include "fifo.h" #include "mem.h" #include "samplefmt.h" diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c index 01641711d6..4f6f7e3234 100644 --- a/libavutil/audioconvert.c +++ b/libavutil/audioconvert.c @@ -27,6 +27,7 @@ #include "avutil.h" #include "audioconvert.h" #include "bprint.h" +#include "common.h" struct channel_name { const char *name; diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 76f6bb2c9b..8b258a4971 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdint.h> #include <stdio.h> #include <string.h> #include <ctype.h> @@ -212,6 +213,7 @@ int av_strncasecmp(const char *a, const char *b, size_t n) #ifdef TEST +#include "common.h" #undef printf int main(void) diff --git a/libavutil/dict.c b/libavutil/dict.c index 6d2d8c8dec..7e7d1cc4a8 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <ctype.h> +#include <string.h> + #include "avstring.h" #include "dict.h" #include "internal.h" diff --git a/libavutil/error.c b/libavutil/error.c index 98a60c20ae..7111644145 100644 --- a/libavutil/error.c +++ b/libavutil/error.c @@ -19,6 +19,7 @@ #undef _GNU_SOURCE #include "avutil.h" #include "avstring.h" +#include "common.h" struct error_entry { int num; diff --git a/libavutil/eval.c b/libavutil/eval.c index 6aa257efc4..dc2fb45cde 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -28,6 +28,7 @@ #include <float.h> #include "avutil.h" +#include "common.h" #include "eval.h" #include "log.h" #include "mathematics.h" diff --git a/libavutil/fifo.h b/libavutil/fifo.h index 515f0980a7..ff66c95daa 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -26,6 +26,7 @@ #include <stdint.h> #include "avutil.h" +#include "attributes.h" typedef struct AVFifoBuffer { uint8_t *buffer; diff --git a/libavutil/file.c b/libavutil/file.c index d52a2e803f..8dbeab6b0f 100644 --- a/libavutil/file.c +++ b/libavutil/file.c @@ -16,8 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "file.h" #include "log.h" +#include "mem.h" #include <fcntl.h> #include <sys/stat.h> #if HAVE_UNISTD_H diff --git a/libavutil/file.h b/libavutil/file.h index f3af9ef7e5..f637005d87 100644 --- a/libavutil/file.h +++ b/libavutil/file.h @@ -19,6 +19,8 @@ #ifndef AVUTIL_FILE_H #define AVUTIL_FILE_H +#include <stdint.h> + #include "avutil.h" /** diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 67368f0679..a3d40877b1 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -21,6 +21,7 @@ * misc image utilities */ +#include "common.h" #include "imgutils.h" #include "internal.h" #include "intreadwrite.h" diff --git a/libavutil/log.c b/libavutil/log.c index 53c756b561..1bae1b2165 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -31,6 +31,7 @@ #endif #include <stdlib.h> #include "avutil.h" +#include "common.h" #include "log.h" #define LINE_SZ 1024 diff --git a/libavutil/mem.h b/libavutil/mem.h index 4f1e6a0cdf..212dbf1773 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -26,6 +26,8 @@ #ifndef AVUTIL_MEM_H #define AVUTIL_MEM_H +#include <limits.h> + #include "attributes.h" #include "error.h" #include "avutil.h" diff --git a/libavutil/opt.c b/libavutil/opt.c index 0adbdddace..fa1d1227a6 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -27,6 +27,7 @@ #include "avutil.h" #include "avstring.h" +#include "common.h" #include "opt.h" #include "eval.h" #include "dict.h" diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 22c45dbac5..588441136d 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -25,6 +25,7 @@ #include "avstring.h" #include "avutil.h" +#include "common.h" #include "eval.h" #include "log.h" #include "random_seed.h" diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c index 838d99c7f1..a03648e200 100644 --- a/libavutil/samplefmt.c +++ b/libavutil/samplefmt.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "common.h" #include "samplefmt.h" #include <stdio.h> diff --git a/libavutil/samplefmt.h b/libavutil/samplefmt.h index 4ce606d975..681e521c69 100644 --- a/libavutil/samplefmt.h +++ b/libavutil/samplefmt.h @@ -19,7 +19,10 @@ #ifndef AVUTIL_SAMPLEFMT_H #define AVUTIL_SAMPLEFMT_H +#include <stdint.h> + #include "avutil.h" +#include "attributes.h" /** * Audio Sample Formats diff --git a/libavutil/timer.h b/libavutil/timer.h index 8a5caecd6c..3e242f3463 100644 --- a/libavutil/timer.h +++ b/libavutil/timer.h @@ -28,6 +28,7 @@ #include <stdlib.h> #include <stdint.h> +#include <inttypes.h> #include "config.h" diff --git a/libavutil/tree.c b/libavutil/tree.c index 58cd33d770..4206539c37 100644 --- a/libavutil/tree.c +++ b/libavutil/tree.c @@ -19,6 +19,7 @@ */ #include "log.h" +#include "mem.h" #include "tree.h" typedef struct AVTreeNode { @@ -157,6 +158,7 @@ void av_tree_enumerate(AVTreeNode *t, void *opaque, #ifdef TEST +#include "common.h" #include "lfg.h" static int check(AVTreeNode *t) diff --git a/libavutil/version.h b/libavutil/version.h index 0e381b75ae..0b9ae393a9 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -39,7 +39,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 69 +#define LIBAVUTIL_VERSION_MINOR 70 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/libavutil/x86/w64xmmtest.h b/libavutil/x86/w64xmmtest.h index 1c1ded86ec..b4ce7d3daf 100644 --- a/libavutil/x86/w64xmmtest.h +++ b/libavutil/x86/w64xmmtest.h @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> #include <stdint.h> #include <stdlib.h> #include <stdarg.h> +#include <string.h> #include "libavutil/bswap.h" diff --git a/libswscale/colorspace-test.c b/libswscale/colorspace-test.c index 6d16785b12..962861c0cc 100644 --- a/libswscale/colorspace-test.c +++ b/libswscale/colorspace-test.c @@ -26,6 +26,7 @@ #include "swscale.h" #include "rgb2rgb.h" +#include "libavutil/mem.h" #define SIZE 1000 #define srcByte 0x55 diff --git a/libswscale/swscale.h b/libswscale/swscale.h index da29d47e3a..a9e803db43 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -27,6 +27,8 @@ * external api for the swscale stuff */ +#include <stdint.h> + #include "libavutil/avutil.h" #include "libavutil/log.h" #include "libavutil/pixfmt.h" diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 5a584f04ca..76431798cd 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -28,6 +28,7 @@ #endif #include "libavutil/avutil.h" +#include "libavutil/common.h" #include "libavutil/log.h" #include "libavutil/pixfmt.h" #include "libavutil/pixdesc.h" diff --git a/tools/graph2dot.c b/tools/graph2dot.c index b34d615382..fa21ede933 100644 --- a/tools/graph2dot.c +++ b/tools/graph2dot.c @@ -19,7 +19,10 @@ */ #include <unistd.h> /* getopt */ +#include <stdio.h> +#include <string.h> +#include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavutil/audioconvert.h" #include "libavfilter/avfiltergraph.h" |