* 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
Unified · Split
| @@ -1365,6 +1365,7 @@ CONFIG_EXTRA=" · 1364 unmodified lines | |||
| 1365 | aandcttables | 1365 | aandcttables |
| 1366 | ac3dsp | 1366 | ac3dsp |
| 1367 | avutil | 1367 | avutil |
| 1368 | error_resilience | ||
| 1368 | gcrypt | 1369 | gcrypt |
| 1369 | golomb | 1370 | golomb |
| 1370 | gplv3 | 1371 | gplv3 |
| @@ -1379,6 +1380,7 @@ CONFIG_EXTRA=" · 8 unmodified lines | |||
| 1379 | mpegvideo | 1380 | mpegvideo |
| 1380 | mpegvideoenc | 1381 | mpegvideoenc |
| 1381 | nettle | 1382 | nettle |
| 1383 | rangecoder | ||
| 1382 | rtpdec | 1384 | rtpdec |
| 1383 | sinewin | 1385 | sinewin |
| 1384 | vp3dsp | 1386 | vp3dsp |
| @@ -1527,11 +1529,12 @@ dnxhd_encoder_select="aandcttables mpegvideoenc" · 142 unmodified lines | |||
| 1527 | dxa_decoder_select="zlib" | 1529 | dxa_decoder_select="zlib" |
| 1528 | eac3_decoder_select="ac3_decoder" | 1530 | eac3_decoder_select="ac3_decoder" |
| 1529 | eac3_encoder_select="mdct ac3dsp" | 1531 | eac3_encoder_select="mdct ac3dsp" |
| 1530 | eamad_decoder_select="aandcttables" | 1532 | eamad_decoder_select="aandcttables error_resilience" |
| 1531 | eatgq_decoder_select="aandcttables" | 1533 | eatgq_decoder_select="aandcttables" |
| 1532 | eatqi_decoder_select="aandcttables mpegvideo" | 1534 | eatqi_decoder_select="aandcttables error_resilience mpegvideo" |
| 1533 | exr_decoder_select="zlib" | 1535 | exr_decoder_select="zlib" |
| 1534 | ffv1_decoder_select="golomb" | 1536 | ffv1_decoder_select="golomb rangecoder" |
| 1537 | ffv1_encoder_select="rangecoder" | ||
| 1535 | flac_decoder_select="golomb" | 1538 | flac_decoder_select="golomb" |
| 1536 | flac_encoder_select="golomb lpc" | 1539 | flac_encoder_select="golomb lpc" |
| 1537 | flashsv_decoder_select="zlib" | 1540 | flashsv_decoder_select="zlib" |
| @@ -1541,15 +1544,15 @@ flashsv2_decoder_select="zlib" · 3 unmodified lines | |||
| 1541 | flv_decoder_select="h263_decoder" | 1544 | flv_decoder_select="h263_decoder" |
| 1542 | flv_encoder_select="h263_encoder" | 1545 | flv_encoder_select="h263_encoder" |
| 1543 | fraps_decoder_select="huffman" | 1546 | fraps_decoder_select="huffman" |
| 1544 | h261_decoder_select="mpegvideo" | 1547 | h261_decoder_select="error_resilience mpegvideo" |
| 1545 | h261_encoder_select="aandcttables mpegvideoenc" | 1548 | h261_encoder_select="aandcttables mpegvideoenc" |
| 1546 | h263_decoder_select="h263_parser mpegvideo" | 1549 | h263_decoder_select="error_resilience h263_parser mpegvideo" |
| 1547 | h263_encoder_select="aandcttables mpegvideoenc" | 1550 | h263_encoder_select="aandcttables error_resilience mpegvideoenc" |
| 1548 | h263_vaapi_hwaccel_select="vaapi h263_decoder" | 1551 | h263_vaapi_hwaccel_select="vaapi h263_decoder" |
| 1549 | h263i_decoder_select="h263_decoder" | 1552 | h263i_decoder_select="h263_decoder" |
| 1550 | h263p_encoder_select="h263_encoder" | 1553 | h263p_encoder_select="h263_encoder" |
| 1551 | h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser" | 1554 | h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser" |
| 1552 | h264_decoder_select="golomb h264chroma h264dsp h264pred h264qpel mpegvideo" | 1555 | h264_decoder_select="error_resilience golomb h264chroma h264dsp h264pred h264qpel mpegvideo" |
| 1553 | h264_dxva2_hwaccel_deps="dxva2api_h" | 1556 | h264_dxva2_hwaccel_deps="dxva2api_h" |
| 1554 | h264_dxva2_hwaccel_select="dxva2 h264_decoder" | 1557 | h264_dxva2_hwaccel_select="dxva2 h264_decoder" |
| 1555 | h264_vaapi_hwaccel_select="vaapi h264_decoder" | 1558 | h264_vaapi_hwaccel_select="vaapi h264_decoder" |
| @@ -1562,7 +1565,7 @@ jpegls_decoder_select="golomb" · 6 unmodified lines | |||
| 1562 | jpegls_encoder_select="golomb" | 1565 | jpegls_encoder_select="golomb" |
| 1563 | ljpeg_encoder_select="aandcttables mpegvideoenc" | 1566 | ljpeg_encoder_select="aandcttables mpegvideoenc" |
| 1564 | loco_decoder_select="golomb" | 1567 | loco_decoder_select="golomb" |
| 1565 | mdec_decoder_select="mpegvideo" | 1568 | mdec_decoder_select="error_resilience mpegvideo" |
| 1566 | mjpeg_encoder_select="aandcttables mpegvideoenc" | 1569 | mjpeg_encoder_select="aandcttables mpegvideoenc" |
| 1567 | mlp_decoder_select="mlp_parser" | 1570 | mlp_decoder_select="mlp_parser" |
| 1568 | mp1_decoder_select="mpegaudiodsp" | 1571 | mp1_decoder_select="mpegaudiodsp" |
| @@ -1582,15 +1585,15 @@ mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h" · 13 unmodified lines | |||
| 1582 | mpeg_xvmc_decoder_select="mpegvideo_decoder" | 1585 | mpeg_xvmc_decoder_select="mpegvideo_decoder" |
| 1583 | mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder" | 1586 | mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder" |
| 1584 | mpeg1_vdpau_hwaccel_select="vdpau mpeg1video_decoder" | 1587 | mpeg1_vdpau_hwaccel_select="vdpau mpeg1video_decoder" |
| 1585 | mpeg1video_decoder_select="mpegvideo" | 1588 | mpeg1video_decoder_select="error_resilience mpegvideo" |
| 1586 | mpeg1video_encoder_select="aandcttables mpegvideoenc" | 1589 | mpeg1video_encoder_select="aandcttables error_resilience mpegvideoenc" |
| 1587 | mpeg2_crystalhd_decoder_select="crystalhd" | 1590 | mpeg2_crystalhd_decoder_select="crystalhd" |
| 1588 | mpeg2_dxva2_hwaccel_deps="dxva2api_h" | 1591 | mpeg2_dxva2_hwaccel_deps="dxva2api_h" |
| 1589 | mpeg2_dxva2_hwaccel_select="dxva2 mpeg2video_decoder" | 1592 | mpeg2_dxva2_hwaccel_select="dxva2 mpeg2video_decoder" |
| 1590 | mpeg2_vdpau_hwaccel_select="vdpau mpeg2video_decoder" | 1593 | mpeg2_vdpau_hwaccel_select="vdpau mpeg2video_decoder" |
| 1591 | mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder" | 1594 | mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder" |
| 1592 | mpeg2video_decoder_select="mpegvideo" | 1595 | mpeg2video_decoder_select="error_resilience mpegvideo" |
| 1593 | mpeg2video_encoder_select="aandcttables mpegvideoenc" | 1596 | mpeg2video_encoder_select="aandcttables error_resilience mpegvideoenc" |
| 1594 | mpeg4_crystalhd_decoder_select="crystalhd" | 1597 | mpeg4_crystalhd_decoder_select="crystalhd" |
| 1595 | mpeg4_decoder_select="h263_decoder mpeg4video_parser" | 1598 | mpeg4_decoder_select="h263_decoder mpeg4video_parser" |
| 1596 | mpeg4_encoder_select="h263_encoder" | 1599 | mpeg4_encoder_select="h263_encoder" |
| @@ -1615,18 +1618,18 @@ rv10_decoder_select="h263_decoder" · 18 unmodified lines | |||
| 1615 | rv10_encoder_select="h263_encoder" | 1618 | rv10_encoder_select="h263_encoder" |
| 1616 | rv20_decoder_select="h263_decoder" | 1619 | rv20_decoder_select="h263_decoder" |
| 1617 | rv20_encoder_select="h263_encoder" | 1620 | rv20_encoder_select="h263_encoder" |
| 1618 | rv30_decoder_select="golomb h264chroma h264pred h264qpel mpegvideo" | 1621 | rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo" |
| 1619 | rv40_decoder_select="golomb h264chroma h264pred h264qpel mpegvideo" | 1622 | rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo" |
| 1620 | shorten_decoder_select="golomb" | 1623 | shorten_decoder_select="golomb" |
| 1621 | sipr_decoder_select="lsp" | 1624 | sipr_decoder_select="lsp" |
| 1622 | snow_decoder_select="dwt" | 1625 | snow_decoder_select="dwt rangecoder" |
| 1623 | snow_encoder_select="aandcttables dwt mpegvideoenc" | 1626 | snow_encoder_select="aandcttables dwt error_resilience mpegvideoenc rangecoder" |
| 1624 | sonic_decoder_select="golomb" | 1627 | sonic_decoder_select="golomb" |
| 1625 | sonic_encoder_select="golomb" | 1628 | sonic_encoder_select="golomb" |
| 1626 | sonic_ls_encoder_select="golomb" | 1629 | sonic_ls_encoder_select="golomb" |
| 1627 | svq1_decoder_select="mpegvideo" | 1630 | svq1_decoder_select="error_resilience mpegvideo" |
| 1628 | svq1_encoder_select="aandcttables mpegvideoenc" | 1631 | svq1_encoder_select="aandcttables error_resilience mpegvideoenc" |
| 1629 | svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel mpegvideo" | 1632 | svq3_decoder_select="error_resilience golomb h264chroma h264dsp h264pred h264qpel mpegvideo" |
| 1630 | svq3_decoder_suggest="zlib" | 1633 | svq3_decoder_suggest="zlib" |
| 1631 | theora_decoder_select="vp3_decoder" | 1634 | theora_decoder_select="vp3_decoder" |
| 1632 | tiff_decoder_suggest="zlib" | 1635 | tiff_decoder_suggest="zlib" |
| @@ -1676,10 +1679,10 @@ vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads" · 43 unmodified lines | |||
| 1676 | vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" | 1679 | vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" |
| 1677 | 1680 | ||
| 1678 | # parsers | 1681 | # parsers |
| 1679 | h264_parser_select="golomb h264dsp h264pred mpegvideo" | 1682 | h264_parser_select="error_resilience golomb h264dsp h264pred mpegvideo" |
| 1680 | mpeg4video_parser_select="mpegvideo" | 1683 | mpeg4video_parser_select="error_resilience mpegvideo" |
| 1681 | mpegvideo_parser_select="mpegvideo" | 1684 | mpegvideo_parser_select="error_resilience mpegvideo" |
| 1682 | vc1_parser_select="mpegvideo" | 1685 | vc1_parser_select="error_resilience mpegvideo" |
| 1683 | 1686 | ||
| 1684 | # external libraries | 1687 | # external libraries |
| 1685 | libaacplus_encoder_deps="libaacplus" | 1688 | libaacplus_encoder_deps="libaacplus" |
| @@ -34,6 +34,7 @@ · 33 unmodified lines | |||
| 34 | #include <libavutil/opt.h> | 34 | #include <libavutil/opt.h> |
| 35 | #include <libavcodec/avcodec.h> | 35 | #include <libavcodec/avcodec.h> |
| 36 | #include <libavutil/audioconvert.h> | 36 | #include <libavutil/audioconvert.h> |
| 37 | #include <libavutil/common.h> | ||
| 37 | #include <libavutil/imgutils.h> | 38 | #include <libavutil/imgutils.h> |
| 38 | #include <libavutil/mathematics.h> | 39 | #include <libavutil/mathematics.h> |
| 39 | #include <libavutil/samplefmt.h> | 40 | #include <libavutil/samplefmt.h> |
| @@ -281,6 +281,9 @@ Size of the decompressed SWF file, required for SWFVerification. · 280 unmodified lines | |||
| 281 | @item rtmp_swfurl | 281 | @item rtmp_swfurl |
| 282 | URL of the SWF player for the media. By default no value will be sent. | 282 | URL of the SWF player for the media. By default no value will be sent. |
| 283 | 283 | ||
| 284 | @item rtmp_swfverify | ||
| 285 | URL to player swf file, compute hash/size automatically. | ||
| 286 | |||
| 284 | @item rtmp_tcurl | 287 | @item rtmp_tcurl |
| 285 | URL of the target stream. Defaults to proto://host[:port]/app. | 288 | URL of the target stream. Defaults to proto://host[:port]/app. |
| 286 | 289 | ||
| @@ -33,7 +33,9 @@ · 32 unmodified lines | |||
| 33 | 33 | ||
| 34 | #include <stdio.h> | 34 | #include <stdio.h> |
| 35 | #include <stdlib.h> | 35 | #include <stdlib.h> |
| 36 | #include <string.h> | ||
| 36 | 37 | ||
| 38 | #include "libavutil/internal.h" | ||
| 37 | #include "libavutil/intreadwrite.h" | 39 | #include "libavutil/intreadwrite.h" |
| 38 | #include "avcodec.h" | 40 | #include "avcodec.h" |
| 39 | 41 | ||
| @@ -39,6 +39,7 @@ · 38 unmodified lines | |||
| 39 | 39 | ||
| 40 | #include "libavutil/avassert.h" | 40 | #include "libavutil/avassert.h" |
| 41 | #include "avcodec.h" | 41 | #include "avcodec.h" |
| 42 | #include "libavutil/common.h" | ||
| 42 | 43 | ||
| 43 | /** decoder context */ | 44 | /** decoder context */ |
| 44 | typedef struct EightSvxContext { | 45 | typedef struct EightSvxContext { |
| @@ -41,6 +41,7 @@ OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o · 40 unmodified lines | |||
| 41 | OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o | 41 | OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o |
| 42 | OBJS-$(CONFIG_DWT) += dwt.o snow.o | 42 | OBJS-$(CONFIG_DWT) += dwt.o snow.o |
| 43 | OBJS-$(CONFIG_DXVA2) += dxva2.o | 43 | OBJS-$(CONFIG_DXVA2) += dxva2.o |
| 44 | OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o | ||
| 44 | FFT-OBJS-$(CONFIG_HARDCODED_TABLES) += cos_tables.o cos_fixed_tables.o | 45 | FFT-OBJS-$(CONFIG_HARDCODED_TABLES) += cos_tables.o cos_fixed_tables.o |
| 45 | OBJS-$(CONFIG_FFT) += avfft.o fft_fixed.o fft_float.o \ | 46 | OBJS-$(CONFIG_FFT) += avfft.o fft_fixed.o fft_float.o \ |
| 46 | $(FFT-OBJS-yes) | 47 | $(FFT-OBJS-yes) |
| @@ -58,6 +59,7 @@ OBJS-$(CONFIG_MPEGAUDIODSP) += mpegaudiodsp.o \ · 11 unmodified lines | |||
| 58 | OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o mpegvideo_motion.o | 59 | OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o mpegvideo_motion.o |
| 59 | OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ | 60 | OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ |
| 60 | motion_est.o ratecontrol.o | 61 | motion_est.o ratecontrol.o |
| 62 | OBJS-$(CONFIG_RANGECODER) += rangecoder.o | ||
| 61 | RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o | 63 | RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o |
| 62 | OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) | 64 | OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) |
| 63 | OBJS-$(CONFIG_SINEWIN) += sinewin.o | 65 | OBJS-$(CONFIG_SINEWIN) += sinewin.o |
| @@ -164,19 +166,19 @@ OBJS-$(CONFIG_EAC3_ENCODER) += eac3enc.o ac3enc.o ac3enc_float.o \ · 100 unmodified lines | |||
| 164 | ac3tab.o ac3.o kbdwin.o eac3_data.o | 166 | ac3tab.o ac3.o kbdwin.o eac3_data.o |
| 165 | OBJS-$(CONFIG_EACMV_DECODER) += eacmv.o | 167 | OBJS-$(CONFIG_EACMV_DECODER) += eacmv.o |
| 166 | OBJS-$(CONFIG_EAMAD_DECODER) += eamad.o eaidct.o mpeg12.o \ | 168 | OBJS-$(CONFIG_EAMAD_DECODER) += eamad.o eaidct.o mpeg12.o \ |
| 167 | mpeg12data.o error_resilience.o | 169 | mpeg12data.o |
| 168 | OBJS-$(CONFIG_EATGQ_DECODER) += eatgq.o eaidct.o | 170 | OBJS-$(CONFIG_EATGQ_DECODER) += eatgq.o eaidct.o |
| 169 | OBJS-$(CONFIG_EATGV_DECODER) += eatgv.o | 171 | OBJS-$(CONFIG_EATGV_DECODER) += eatgv.o |
| 170 | OBJS-$(CONFIG_EATQI_DECODER) += eatqi.o eaidct.o mpeg12.o \ | 172 | OBJS-$(CONFIG_EATQI_DECODER) += eatqi.o eaidct.o mpeg12.o \ |
| 171 | mpeg12data.o error_resilience.o | 173 | mpeg12data.o |
| 172 | OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.o | 174 | OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.o |
| 173 | OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER) += 8svx.o | 175 | OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER) += 8svx.o |
| 174 | OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o | 176 | OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o |
| 175 | OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o | 177 | OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o |
| 176 | OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o | 178 | OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o |
| 177 | OBJS-$(CONFIG_EXR_DECODER) += exr.o | 179 | OBJS-$(CONFIG_EXR_DECODER) += exr.o |
| 178 | OBJS-$(CONFIG_FFV1_DECODER) += ffv1.o rangecoder.o | 180 | OBJS-$(CONFIG_FFV1_DECODER) += ffv1.o |
| 179 | OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.o rangecoder.o | 181 | OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.o |
| 180 | OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o | 182 | OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o |
| 181 | OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o | 183 | OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o |
| 182 | OBJS-$(CONFIG_FFWAVESYNTH_DECODER) += ffwavesynth.o | 184 | OBJS-$(CONFIG_FFWAVESYNTH_DECODER) += ffwavesynth.o |
| @@ -198,20 +200,18 @@ OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o · 15 unmodified lines | |||
| 198 | OBJS-$(CONFIG_GIF_ENCODER) += gif.o lzwenc.o | 200 | OBJS-$(CONFIG_GIF_ENCODER) += gif.o lzwenc.o |
| 199 | OBJS-$(CONFIG_GSM_DECODER) += gsmdec.o gsmdec_data.o msgsmdec.o | 201 | OBJS-$(CONFIG_GSM_DECODER) += gsmdec.o gsmdec_data.o msgsmdec.o |
| 200 | OBJS-$(CONFIG_GSM_MS_DECODER) += gsmdec.o gsmdec_data.o msgsmdec.o | 202 | OBJS-$(CONFIG_GSM_MS_DECODER) += gsmdec.o gsmdec_data.o msgsmdec.o |
| 201 | OBJS-$(CONFIG_H261_DECODER) += h261dec.o h261.o h261data.o error_resilience.o | 203 | OBJS-$(CONFIG_H261_DECODER) += h261dec.o h261.o h261data.o |
| 202 | OBJS-$(CONFIG_H261_ENCODER) += h261enc.o h261.o h261data.o | 204 | OBJS-$(CONFIG_H261_ENCODER) += h261enc.o h261.o h261data.o |
| 203 | OBJS-$(CONFIG_H263_DECODER) += h263dec.o h263.o ituh263dec.o \ | 205 | OBJS-$(CONFIG_H263_DECODER) += h263dec.o h263.o ituh263dec.o \ |
| 204 | mpeg4video.o mpeg4videodec.o flvdec.o\ | 206 | mpeg4video.o mpeg4videodec.o flvdec.o\ |
| 205 | intelh263dec.o error_resilience.o | 207 | intelh263dec.o |
| 206 | OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += vaapi_mpeg4.o | 208 | OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += vaapi_mpeg4.o |
| 207 | OBJS-$(CONFIG_H263_ENCODER) += mpeg4videoenc.o mpeg4video.o \ | 209 | OBJS-$(CONFIG_H263_ENCODER) += mpeg4videoenc.o mpeg4video.o \ |
| 208 | h263.o ituh263enc.o flvenc.o \ | 210 | h263.o ituh263enc.o flvenc.o |
| 209 | error_resilience.o | ||
| 210 | OBJS-$(CONFIG_H264_DECODER) += h264.o \ | 211 | OBJS-$(CONFIG_H264_DECODER) += h264.o \ |
| 211 | h264_loopfilter.o h264_direct.o \ | 212 | h264_loopfilter.o h264_direct.o \ |
| 212 | cabac.o h264_sei.o h264_ps.o \ | 213 | cabac.o h264_sei.o h264_ps.o \ |
| 213 | h264_refs.o h264_cavlc.o h264_cabac.o\ | 214 | h264_refs.o h264_cavlc.o h264_cabac.o |
| 214 | error_resilience.o | ||
| 215 | OBJS-$(CONFIG_H264_DXVA2_HWACCEL) += dxva2_h264.o | 215 | OBJS-$(CONFIG_H264_DXVA2_HWACCEL) += dxva2_h264.o |
| 216 | OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o | 216 | OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o |
| 217 | OBJS-$(CONFIG_H264_VDA_HWACCEL) += vda_h264.o | 217 | OBJS-$(CONFIG_H264_VDA_HWACCEL) += vda_h264.o |
| @@ -243,8 +243,7 @@ OBJS-$(CONFIG_LJPEG_ENCODER) += ljpegenc.o mjpegenc.o mjpeg.o · 25 unmodified lines | |||
| 243 | OBJS-$(CONFIG_LOCO_DECODER) += loco.o | 243 | OBJS-$(CONFIG_LOCO_DECODER) += loco.o |
| 244 | OBJS-$(CONFIG_MACE3_DECODER) += mace.o | 244 | OBJS-$(CONFIG_MACE3_DECODER) += mace.o |
| 245 | OBJS-$(CONFIG_MACE6_DECODER) += mace.o | 245 | OBJS-$(CONFIG_MACE6_DECODER) += mace.o |
| 246 | OBJS-$(CONFIG_MDEC_DECODER) += mdec.o mpeg12.o mpeg12data.o \ | 246 | OBJS-$(CONFIG_MDEC_DECODER) += mdec.o mpeg12.o mpeg12data.o |
| 247 | error_resilience.o | ||
| 248 | OBJS-$(CONFIG_MICRODVD_DECODER) += microdvddec.o ass.o | 247 | OBJS-$(CONFIG_MICRODVD_DECODER) += microdvddec.o ass.o |
| 249 | OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o | 248 | OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o |
| 250 | OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.o | 249 | OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.o |
| @@ -288,18 +287,14 @@ OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o mpegaudiodec.o \ · 37 unmodified lines | |||
| 288 | OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12.o mpeg12data.o \ | 287 | OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12.o mpeg12data.o \ |
| 289 | mpegvideo.o error_resilience.o | 288 | mpegvideo.o error_resilience.o |
| 290 | OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o | 289 | OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o |
| 291 | OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12.o mpeg12data.o \ | 290 | OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12.o mpeg12data.o |
| 292 | error_resilience.o | ||
| 293 | OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12.o \ | 291 | OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12.o \ |
| 294 | timecode.o \ | 292 | timecode.o |
| 295 | error_resilience.o | ||
| 296 | OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL) += dxva2_mpeg2.o | 293 | OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL) += dxva2_mpeg2.o |
| 297 | OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += vaapi_mpeg2.o | 294 | OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += vaapi_mpeg2.o |
| 298 | OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12.o mpeg12data.o \ | 295 | OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12.o mpeg12data.o |
| 299 | error_resilience.o | ||
| 300 | OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12.o \ | 296 | OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12.o \ |
| 301 | timecode.o \ | 297 | timecode.o |
| 302 | error_resilience.o | ||
| 303 | OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o | 298 | OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o |
| 304 | OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o msmpeg4data.o | 299 | OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o msmpeg4data.o |
| 305 | OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o \ | 300 | OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o \ |
| @@ -380,10 +375,8 @@ OBJS-$(CONFIG_RV10_DECODER) += rv10.o · 74 unmodified lines | |||
| 380 | OBJS-$(CONFIG_RV10_ENCODER) += rv10enc.o | 375 | OBJS-$(CONFIG_RV10_ENCODER) += rv10enc.o |
| 381 | OBJS-$(CONFIG_RV20_DECODER) += rv10.o | 376 | OBJS-$(CONFIG_RV20_DECODER) += rv10.o |
| 382 | OBJS-$(CONFIG_RV20_ENCODER) += rv20enc.o | 377 | OBJS-$(CONFIG_RV20_ENCODER) += rv20enc.o |
| 383 | OBJS-$(CONFIG_RV30_DECODER) += rv30.o rv34.o rv30dsp.o rv34dsp.o \ | 378 | OBJS-$(CONFIG_RV30_DECODER) += rv30.o rv34.o rv30dsp.o rv34dsp.o |
| 384 | error_resilience.o | 379 | OBJS-$(CONFIG_RV40_DECODER) += rv40.o rv34.o rv34dsp.o rv40dsp.o |
| 385 | OBJS-$(CONFIG_RV40_DECODER) += rv40.o rv34.o rv34dsp.o rv40dsp.o \ | ||
| 386 | error_resilience.o | ||
| 387 | OBJS-$(CONFIG_SAMI_DECODER) += samidec.o ass.o | 380 | OBJS-$(CONFIG_SAMI_DECODER) += samidec.o ass.o |
| 388 | OBJS-$(CONFIG_S302M_DECODER) += s302m.o | 381 | OBJS-$(CONFIG_S302M_DECODER) += s302m.o |
| 389 | OBJS-$(CONFIG_SANM_DECODER) += sanm.o | 382 | OBJS-$(CONFIG_SANM_DECODER) += sanm.o |
| @@ -397,10 +390,9 @@ OBJS-$(CONFIG_SIPR_DECODER) += sipr.o acelp_pitch_delay.o \ · 7 unmodified lines | |||
| 397 | OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o | 390 | OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o |
| 398 | OBJS-$(CONFIG_SMACKER_DECODER) += smacker.o | 391 | OBJS-$(CONFIG_SMACKER_DECODER) += smacker.o |
| 399 | OBJS-$(CONFIG_SMC_DECODER) += smc.o | 392 | OBJS-$(CONFIG_SMC_DECODER) += smc.o |
| 400 | OBJS-$(CONFIG_SNOW_DECODER) += snowdec.o snow.o rangecoder.o | 393 | OBJS-$(CONFIG_SNOW_DECODER) += snowdec.o snow.o |
| 401 | OBJS-$(CONFIG_SNOW_ENCODER) += snowenc.o snow.o rangecoder.o \ | 394 | OBJS-$(CONFIG_SNOW_ENCODER) += snowenc.o snow.o \ |
| 402 | h263.o ituh263enc.o \ | 395 | h263.o ituh263enc.o |
| 403 | error_resilience.o | ||
| 404 | OBJS-$(CONFIG_SOL_DPCM_DECODER) += dpcm.o | 396 | OBJS-$(CONFIG_SOL_DPCM_DECODER) += dpcm.o |
| 405 | OBJS-$(CONFIG_SONIC_DECODER) += sonic.o | 397 | OBJS-$(CONFIG_SONIC_DECODER) += sonic.o |
| 406 | OBJS-$(CONFIG_SONIC_ENCODER) += sonic.o | 398 | OBJS-$(CONFIG_SONIC_ENCODER) += sonic.o |
| @@ -413,16 +405,13 @@ OBJS-$(CONFIG_SUBRIP_ENCODER) += srtenc.o ass_split.o · 6 unmodified lines | |||
| 413 | OBJS-$(CONFIG_SUBVIEWER_DECODER) += subviewerdec.o ass.o | 405 | OBJS-$(CONFIG_SUBVIEWER_DECODER) += subviewerdec.o ass.o |
| 414 | OBJS-$(CONFIG_SUNRAST_DECODER) += sunrast.o | 406 | OBJS-$(CONFIG_SUNRAST_DECODER) += sunrast.o |
| 415 | OBJS-$(CONFIG_SUNRAST_ENCODER) += sunrastenc.o | 407 | OBJS-$(CONFIG_SUNRAST_ENCODER) += sunrastenc.o |
| 416 | OBJS-$(CONFIG_SVQ1_DECODER) += svq1dec.o svq1.o h263.o \ | 408 | OBJS-$(CONFIG_SVQ1_DECODER) += svq1dec.o svq1.o h263.o |
| 417 | error_resilience.o | ||
| 418 | OBJS-$(CONFIG_SVQ1_ENCODER) += svq1enc.o svq1.o \ | 409 | OBJS-$(CONFIG_SVQ1_ENCODER) += svq1enc.o svq1.o \ |
| 419 | h263.o ituh263enc.o \ | 410 | h263.o ituh263enc.o |
| 420 | error_resilience.o | ||
| 421 | OBJS-$(CONFIG_SVQ3_DECODER) += h264.o svq3.o \ | 411 | OBJS-$(CONFIG_SVQ3_DECODER) += h264.o svq3.o \ |
| 422 | h264_loopfilter.o h264_direct.o \ | 412 | h264_loopfilter.o h264_direct.o \ |
| 423 | h264_sei.o h264_ps.o h264_refs.o \ | 413 | h264_sei.o h264_ps.o h264_refs.o \ |
| 424 | h264_cavlc.o h264_cabac.o cabac.o \ | 414 | h264_cavlc.o h264_cabac.o cabac.o \ |
| 425 | error_resilience.o \ | ||
| 426 | svq1dec.o svq1.o h263.o | 415 | svq1dec.o svq1.o h263.o |
| 427 | OBJS-$(CONFIG_TARGA_DECODER) += targa.o | 416 | OBJS-$(CONFIG_TARGA_DECODER) += targa.o |
| 428 | OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o rle.o | 417 | OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o rle.o |
| @@ -715,27 +704,24 @@ OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264.o \ · 286 unmodified lines | |||
| 715 | cabac.o \ | 704 | cabac.o \ |
| 716 | h264_refs.o h264_sei.o h264_direct.o \ | 705 | h264_refs.o h264_sei.o h264_direct.o \ |
| 717 | h264_loopfilter.o h264_cabac.o \ | 706 | h264_loopfilter.o h264_cabac.o \ |
| 718 | h264_cavlc.o h264_ps.o \ | 707 | h264_cavlc.o h264_ps.o |
| 719 | error_resilience.o | ||
| 720 | OBJS-$(CONFIG_AAC_LATM_PARSER) += latm_parser.o | 708 | OBJS-$(CONFIG_AAC_LATM_PARSER) += latm_parser.o |
| 721 | OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o | 709 | OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o |
| 722 | OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o | 710 | OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o |
| 723 | OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += mpeg4video_parser.o h263.o \ | 711 | OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += mpeg4video_parser.o h263.o \ |
| 724 | error_resilience.o \ | ||
| 725 | mpeg4videodec.o mpeg4video.o \ | 712 | mpeg4videodec.o mpeg4video.o \ |
| 726 | ituh263dec.o h263dec.o | 713 | ituh263dec.o h263dec.o |
| 727 | OBJS-$(CONFIG_PNG_PARSER) += png_parser.o | 714 | OBJS-$(CONFIG_PNG_PARSER) += png_parser.o |
| 728 | OBJS-$(CONFIG_MPEGAUDIO_PARSER) += mpegaudio_parser.o \ | 715 | OBJS-$(CONFIG_MPEGAUDIO_PARSER) += mpegaudio_parser.o \ |
| 729 | mpegaudiodecheader.o mpegaudiodata.o | 716 | mpegaudiodecheader.o mpegaudiodata.o |
| 730 | OBJS-$(CONFIG_MPEGVIDEO_PARSER) += mpegvideo_parser.o \ | 717 | OBJS-$(CONFIG_MPEGVIDEO_PARSER) += mpegvideo_parser.o \ |
| 731 | mpeg12.o mpeg12data.o \ | 718 | mpeg12.o mpeg12data.o |
| 732 | error_resilience.o | ||
| 733 | OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o | 719 | OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o |
| 734 | OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o | 720 | OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o |
| 735 | OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o | 721 | OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o |
| 736 | OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o vc1.o vc1data.o \ | 722 | OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o vc1.o vc1data.o \ |
| 737 | msmpeg4.o msmpeg4data.o mpeg4video.o \ | 723 | msmpeg4.o msmpeg4data.o mpeg4video.o \ |
| 738 | h263.o error_resilience.o | 724 | h263.o |
| 739 | OBJS-$(CONFIG_VORBIS_PARSER) += vorbis_parser.o xiph.o | 725 | OBJS-$(CONFIG_VORBIS_PARSER) += vorbis_parser.o xiph.o |
| 740 | OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o | 726 | OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o |
| 741 | OBJS-$(CONFIG_VP8_PARSER) += vp8_parser.o | 727 | OBJS-$(CONFIG_VP8_PARSER) += vp8_parser.o |
| @@ -29,6 +29,7 @@ · 28 unmodified lines | |||
| 29 | #include "a64tables.h" | 29 | #include "a64tables.h" |
| 30 | #include "elbg.h" | 30 | #include "elbg.h" |
| 31 | #include "internal.h" | 31 | #include "internal.h" |
| 32 | #include "libavutil/common.h" | ||
| 32 | #include "libavutil/intreadwrite.h" | 33 | #include "libavutil/intreadwrite.h" |
| 33 | 34 | ||
| 34 | #define DITHERSTEPS 8 | 35 | #define DITHERSTEPS 8 |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include "libavutil/common.h" | ||
| 23 | #include "parser.h" | 24 | #include "parser.h" |
| 24 | #include "aac_ac3_parser.h" | 25 | #include "aac_ac3_parser.h" |
| 25 | 26 | ||
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | #include <inttypes.h> | 23 | #include <inttypes.h> |
| 24 | 24 | ||
| 25 | #include "libavutil/common.h" | ||
| 25 | #include "avcodec.h" | 26 | #include "avcodec.h" |
| 26 | #include "acelp_filters.h" | 27 | #include "acelp_filters.h" |
| 27 | 28 | ||
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include "libavutil/common.h" | ||
| 23 | #include "libavutil/mathematics.h" | 24 | #include "libavutil/mathematics.h" |
| 24 | #include "avcodec.h" | 25 | #include "avcodec.h" |
| 25 | #include "dsputil.h" | 26 | #include "dsputil.h" |
| @@ -21,6 +21,8 @@ · 20 unmodified lines | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <inttypes.h> | 23 | #include <inttypes.h> |
| 24 | |||
| 25 | #include "libavutil/common.h" | ||
| 24 | #include "avcodec.h" | 26 | #include "avcodec.h" |
| 25 | #include "acelp_vectors.h" | 27 | #include "acelp_vectors.h" |
| 26 | #include "celp_math.h" | 28 | #include "celp_math.h" |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/common.h" | ||
| 21 | #include "libavutil/intreadwrite.h" | 22 | #include "libavutil/intreadwrite.h" |
| 22 | #include "libavutil/mathematics.h" | 23 | #include "libavutil/mathematics.h" |
| 23 | #include "adx.h" | 24 | #include "adx.h" |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "avcodec.h" | 27 | #include "avcodec.h" |
| 28 | #include "config.h" | ||
| 28 | 29 | ||
| 29 | #define REGISTER_HWACCEL(X,x) { \ | 30 | #define REGISTER_HWACCEL(X,x) { \ |
| 30 | extern AVHWAccel ff_##x##_hwaccel; \ | 31 | extern AVHWAccel ff_##x##_hwaccel; \ |
| @@ -23,6 +23,8 @@ · 22 unmodified lines | |||
| 23 | #ifndef AVCODEC_AMR_H | 23 | #ifndef AVCODEC_AMR_H |
| 24 | #define AVCODEC_AMR_H | 24 | #define AVCODEC_AMR_H |
| 25 | 25 | ||
| 26 | #include <string.h> | ||
| 27 | |||
| 26 | #include "avcodec.h" | 28 | #include "avcodec.h" |
| 27 | 29 | ||
| 28 | #ifdef AMR_USE_16BIT_TABLES | 30 | #ifdef AMR_USE_16BIT_TABLES |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | * AMR wideband decoder | 24 | * AMR wideband decoder |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "libavutil/common.h" | ||
| 27 | #include "libavutil/lfg.h" | 28 | #include "libavutil/lfg.h" |
| 28 | 29 | ||
| 29 | #include "avcodec.h" | 30 | #include "avcodec.h" |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | * ASCII/ANSI art decoder | 24 | * ASCII/ANSI art decoder |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "libavutil/common.h" | ||
| 27 | #include "libavutil/lfg.h" | 28 | #include "libavutil/lfg.h" |
| 28 | #include "avcodec.h" | 29 | #include "avcodec.h" |
| 29 | #include "cga_data.h" | 30 | #include "cga_data.h" |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include "avcodec.h" | 22 | #include "avcodec.h" |
| 23 | #include "ass.h" | 23 | #include "ass.h" |
| 24 | #include "libavutil/avstring.h" | 24 | #include "libavutil/avstring.h" |
| 25 | #include "libavutil/common.h" | ||
| 25 | 26 | ||
| 26 | int ff_ass_subtitle_header(AVCodecContext *avctx, | 27 | int ff_ass_subtitle_header(AVCodecContext *avctx, |
| 27 | const char *font, int font_size, | 28 | const char *font, int font_size, |
| @@ -19,9 +19,13 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <string.h> | ||
| 23 | |||
| 22 | #include "avcodec.h" | 24 | #include "avcodec.h" |
| 23 | #include "ass.h" | 25 | #include "ass.h" |
| 24 | #include "ass_split.h" | 26 | #include "ass_split.h" |
| 27 | #include "libavutil/internal.h" | ||
| 28 | #include "libavutil/mem.h" | ||
| 25 | 29 | ||
| 26 | static av_cold int ass_decode_init(AVCodecContext *avctx) | 30 | static av_cold int ass_decode_init(AVCodecContext *avctx) |
| 27 | { | 31 | { |
| @@ -19,8 +19,12 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <string.h> | ||
| 23 | |||
| 22 | #include "avcodec.h" | 24 | #include "avcodec.h" |
| 23 | #include "libavutil/avstring.h" | 25 | #include "libavutil/avstring.h" |
| 26 | #include "libavutil/internal.h" | ||
| 27 | #include "libavutil/mem.h" | ||
| 24 | 28 | ||
| 25 | static av_cold int ass_encode_init(AVCodecContext *avctx) | 29 | static av_cold int ass_encode_init(AVCodecContext *avctx) |
| 26 | { | 30 | { |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include <math.h> | 27 | #include <math.h> |
| 28 | #include <stddef.h> | 28 | #include <stddef.h> |
| 29 | #include <stdio.h> | 29 | #include <stdio.h> |
| 30 | #include <string.h> | ||
| 30 | 31 | ||
| 31 | #include "avcodec.h" | 32 | #include "avcodec.h" |
| 32 | #include "dsputil.h" | 33 | #include "dsputil.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/common.h" | ||
| 22 | #include "audio_frame_queue.h" | 23 | #include "audio_frame_queue.h" |
| 23 | #include "internal.h" | 24 | #include "internal.h" |
| 24 | #include "libavutil/avassert.h" | 25 | #include "libavutil/avassert.h" |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include "libavutil/avstring.h" | 28 | #include "libavutil/avstring.h" |
| 29 | #include "libavutil/common.h" | ||
| 29 | #include "libavutil/libm.h" | 30 | #include "libavutil/libm.h" |
| 30 | #include "libavutil/samplefmt.h" | 31 | #include "libavutil/samplefmt.h" |
| 31 | #include "avcodec.h" | 32 | #include "avcodec.h" |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include "avcodec.h" | 26 | #include "avcodec.h" |
| 27 | #include "libavutil/internal.h" | ||
| 27 | 28 | ||
| 28 | typedef struct AuraDecodeContext { | 29 | typedef struct AuraDecodeContext { |
| 29 | AVCodecContext *avctx; | 30 | AVCodecContext *avctx; |
| @@ -19,10 +19,13 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "internal.h" | 22 | #include <string.h> |
| 23 | |||
| 23 | #include "libavutil/avassert.h" | 24 | #include "libavutil/avassert.h" |
| 24 | #include "bytestream.h" | 25 | #include "libavutil/mem.h" |
| 25 | #include "avcodec.h" | 26 | #include "avcodec.h" |
| 27 | #include "bytestream.h" | ||
| 28 | #include "internal.h" | ||
| 26 | 29 | ||
| 27 | void av_destruct_packet_nofree(AVPacket *pkt) | 30 | void av_destruct_packet_nofree(AVPacket *pkt) |
| 28 | { | 31 | { |
| @@ -18,7 +18,10 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <string.h> | ||
| 22 | |||
| 21 | #include "avcodec.h" | 23 | #include "avcodec.h" |
| 24 | #include "libavutil/mem.h" | ||
| 22 | 25 | ||
| 23 | static AVBitStreamFilter *first_bitstream_filter= NULL; | 26 | static AVBitStreamFilter *first_bitstream_filter= NULL; |
| 24 | 27 | ||
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | #include <stdio.h> | 25 | #include <stdio.h> |
| 26 | #include "dsputil.h" | 26 | #include "dsputil.h" |
| 27 | #include "cavsdsp.h" | 27 | #include "cavsdsp.h" |
| 28 | #include "libavutil/common.h" | ||
| 28 | 29 | ||
| 29 | /***************************************************************************** | 30 | /***************************************************************************** |
| 30 | * | 31 | * |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | #include "avcodec.h" | 25 | #include "avcodec.h" |
| 26 | #include "celp_filters.h" | 26 | #include "celp_filters.h" |
| 27 | #include "libavutil/common.h" | ||
| 27 | 28 | ||
| 28 | void ff_celp_convolve_circ(int16_t* fc_out, const int16_t* fc_in, | 29 | void ff_celp_convolve_circ(int16_t* fc_out, const int16_t* fc_in, |
| 29 | const int16_t* filter, int len) | 30 | const int16_t* filter, int len) |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include "avcodec.h" | 27 | #include "avcodec.h" |
| 28 | #include "mathops.h" | 28 | #include "mathops.h" |
| 29 | #include "celp_math.h" | 29 | #include "celp_math.h" |
| 30 | #include "libavutil/common.h" | ||
| 30 | 31 | ||
| 31 | #ifdef G729_BITEXACT | 32 | #ifdef G729_BITEXACT |
| 32 | /** | 33 | /** |
| @@ -34,6 +34,7 @@ · 33 unmodified lines | |||
| 34 | #include <stdlib.h> | 34 | #include <stdlib.h> |
| 35 | #include <string.h> | 35 | #include <string.h> |
| 36 | 36 | ||
| 37 | #include "libavutil/common.h" | ||
| 37 | #include "libavutil/intreadwrite.h" | 38 | #include "libavutil/intreadwrite.h" |
| 38 | #include "avcodec.h" | 39 | #include "avcodec.h" |
| 39 | 40 | ||
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include "avcodec.h" | 22 | #include "avcodec.h" |
| 23 | 23 | ||
| 24 | #include "libavutil/common.h" | ||
| 24 | #include "libavutil/internal.h" | 25 | #include "libavutil/internal.h" |
| 25 | 26 | ||
| 26 | static const AVCodecDescriptor codec_descriptors[] = { | 27 | static const AVCodecDescriptor codec_descriptors[] = { |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include <stdlib.h> | 22 | #include <stdlib.h> |
| 23 | 23 | ||
| 24 | #include "avcodec.h" | 24 | #include "avcodec.h" |
| 25 | #include "libavutil/common.h" | ||
| 25 | 26 | ||
| 26 | #if CONFIG_ZLIB | 27 | #if CONFIG_ZLIB |
| 27 | #include <zlib.h> | 28 | #include <zlib.h> |
| @@ -34,6 +34,7 @@ · 33 unmodified lines | |||
| 34 | 34 | ||
| 35 | #include "avcodec.h" | 35 | #include "avcodec.h" |
| 36 | #include "dsputil.h" | 36 | #include "dsputil.h" |
| 37 | #include "libavutil/internal.h" | ||
| 37 | 38 | ||
| 38 | 39 | ||
| 39 | typedef struct CyuvDecodeContext { | 40 | typedef struct CyuvDecodeContext { |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <math.h> | 30 | #include <math.h> |
| 31 | #include <string.h> | ||
| 31 | 32 | ||
| 32 | #include "libavutil/mathematics.h" | 33 | #include "libavutil/mathematics.h" |
| 33 | #include "dct.h" | 34 | #include "dct.h" |
| @@ -27,7 +27,10 @@ · 26 unmodified lines | |||
| 27 | * @author Marco Gerards <marco@gnu.org> | 27 | * @author Marco Gerards <marco@gnu.org> |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <string.h> | ||
| 31 | |||
| 30 | #include "libavutil/intreadwrite.h" | 32 | #include "libavutil/intreadwrite.h" |
| 33 | #include "libavutil/mem.h" | ||
| 31 | #include "parser.h" | 34 | #include "parser.h" |
| 32 | 35 | ||
| 33 | #define DIRAC_PARSE_INFO_PREFIX 0x42424344 | 36 | #define DIRAC_PARSE_INFO_PREFIX 0x42424344 |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include "avcodec.h" | 22 | #include "avcodec.h" |
| 23 | #include "dnxhddata.h" | 23 | #include "dnxhddata.h" |
| 24 | #include "libavutil/common.h" | ||
| 24 | 25 | ||
| 25 | /* The quantization tables below are in zigzag order! */ | 26 | /* The quantization tables below are in zigzag order! */ |
| 26 | 27 | ||
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/common.h" | ||
| 22 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 23 | #include "libavutil/imgutils.h" | 24 | #include "libavutil/imgutils.h" |
| 24 | #include "avcodec.h" | 25 | #include "avcodec.h" |
| @@ -18,7 +18,10 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <string.h> | ||
| 22 | |||
| 21 | #include "avcodec.h" | 23 | #include "avcodec.h" |
| 24 | #include "libavutil/mem.h" | ||
| 22 | 25 | ||
| 23 | 26 | ||
| 24 | static int dump_extradata(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args, | 27 | static int dump_extradata(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args, |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | 18 | ||
| 19 | #include <stdint.h> | 19 | #include <stdint.h> |
| 20 | 20 | ||
| 21 | #include "libavutil/common.h" | ||
| 21 | #include "libavutil/intreadwrite.h" | 22 | #include "libavutil/intreadwrite.h" |
| 22 | #include "libavutil/log.h" | 23 | #include "libavutil/log.h" |
| 23 | #include "libavutil/pixdesc.h" | 24 | #include "libavutil/pixdesc.h" |
| @@ -19,7 +19,10 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <string.h> | ||
| 23 | |||
| 22 | #include "libavutil/intreadwrite.h" | 24 | #include "libavutil/intreadwrite.h" |
| 25 | #include "libavutil/mem.h" | ||
| 23 | #include "avcodec.h" | 26 | #include "avcodec.h" |
| 24 | 27 | ||
| 25 | /* parser definition */ | 28 | /* parser definition */ |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include "libavutil/attributes.h" | 22 | #include "libavutil/attributes.h" |
| 23 | #include "libavutil/avassert.h" | 23 | #include "libavutil/avassert.h" |
| 24 | #include "libavutil/common.h" | ||
| 24 | #include "dsputil.h" | 25 | #include "dsputil.h" |
| 25 | #include "dwt.h" | 26 | #include "dwt.h" |
| 26 | #include "libavcodec/x86/dwt.h" | 27 | #include "libavcodec/x86/dwt.h" |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include <stdio.h> | 27 | #include <stdio.h> |
| 28 | #include <stdlib.h> | 28 | #include <stdlib.h> |
| 29 | 29 | ||
| 30 | #include "libavutil/common.h" | ||
| 30 | #include "libavutil/intreadwrite.h" | 31 | #include "libavutil/intreadwrite.h" |
| 31 | #include "avcodec.h" | 32 | #include "avcodec.h" |
| 32 | 33 | ||
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include "avcodec.h" | 23 | #include "avcodec.h" |
| 24 | #include "libavutil/common.h" | ||
| 24 | #include "libavutil/intreadwrite.h" | 25 | #include "libavutil/intreadwrite.h" |
| 25 | 26 | ||
| 26 | static av_cold int decode_init(AVCodecContext *avctx) | 27 | static av_cold int decode_init(AVCodecContext *avctx) |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_CMV | 28 | * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_CMV |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include "libavutil/common.h" | ||
| 31 | #include "libavutil/intreadwrite.h" | 32 | #include "libavutil/intreadwrite.h" |
| 32 | #include "libavutil/imgutils.h" | 33 | #include "libavutil/imgutils.h" |
| 33 | #include "avcodec.h" | 34 | #include "avcodec.h" |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | 27 | ||
| 28 | #include "dsputil.h" | 28 | #include "dsputil.h" |
| 29 | #include "eaidct.h" | 29 | #include "eaidct.h" |
| 30 | #include "libavutil/common.h" | ||
| 30 | 31 | ||
| 31 | #define ASQRT 181 /* (1/sqrt(2))<<8 */ | 32 | #define ASQRT 181 /* (1/sqrt(2))<<8 */ |
| 32 | #define A4 669 /* cos(pi/8)*sqrt(2)<<9 */ | 33 | #define A4 669 /* cos(pi/8)*sqrt(2)<<9 */ |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | #include <string.h> | 26 | #include <string.h> |
| 27 | 27 | ||
| 28 | #include "libavutil/common.h" | ||
| 28 | #include "libavutil/lfg.h" | 29 | #include "libavutil/lfg.h" |
| 29 | #include "elbg.h" | 30 | #include "elbg.h" |
| 30 | #include "avcodec.h" | 31 | #include "avcodec.h" |
| @@ -27,6 +27,8 @@ · 26 unmodified lines | |||
| 27 | 27 | ||
| 28 | #include "dsputil.h" | 28 | #include "dsputil.h" |
| 29 | #include "faandct.h" | 29 | #include "faandct.h" |
| 30 | #include "libavutil/internal.h" | ||
| 31 | #include "libavutil/libm.h" | ||
| 30 | 32 | ||
| 31 | #define FLOAT float | 33 | #define FLOAT float |
| 32 | 34 | ||
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | #include "faanidct.h" | 21 | #include "faanidct.h" |
| 22 | #include "libavutil/common.h" | ||
| 22 | 23 | ||
| 23 | /* To allow switching to double. */ | 24 | /* To allow switching to double. */ |
| 24 | #define FLOAT float | 25 | #define FLOAT float |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | #include "avcodec.h" | 23 | #include "avcodec.h" |
| 24 | #include "fmtconvert.h" | 24 | #include "fmtconvert.h" |
| 25 | #include "libavutil/common.h" | ||
| 25 | 26 | ||
| 26 | static void int32_to_float_fmul_scalar_c(float *dst, const int *src, float mul, int len){ | 27 | static void int32_to_float_fmul_scalar_c(float *dst, const int *src, float mul, int len){ |
| 27 | int i; | 28 | int i; |
| @@ -31,6 +31,7 @@ · 30 unmodified lines | |||
| 31 | #include "avcodec.h" | 31 | #include "avcodec.h" |
| 32 | #include "internal.h" | 32 | #include "internal.h" |
| 33 | #include "g722.h" | 33 | #include "g722.h" |
| 34 | #include "libavutil/common.h" | ||
| 34 | 35 | ||
| 35 | #define FREEZE_INTERVAL 128 | 36 | #define FREEZE_INTERVAL 128 |
| 36 | 37 | ||
| @@ -19,7 +19,10 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <string.h> | ||
| 23 | |||
| 22 | #include "libavutil/intreadwrite.h" | 24 | #include "libavutil/intreadwrite.h" |
| 25 | #include "libavutil/mem.h" | ||
| 23 | #include "avcodec.h" | 26 | #include "avcodec.h" |
| 24 | 27 | ||
| 25 | typedef struct H264BSFContext { | 28 | typedef struct H264BSFContext { |
| @@ -29,6 +29,7 @@ · 28 unmodified lines | |||
| 29 | #include "libavutil/avassert.h" | 29 | #include "libavutil/avassert.h" |
| 30 | #include "avcodec.h" | 30 | #include "avcodec.h" |
| 31 | #include "h264dsp.h" | 31 | #include "h264dsp.h" |
| 32 | #include "libavutil/common.h" | ||
| 32 | 33 | ||
| 33 | #define BIT_DEPTH 8 | 34 | #define BIT_DEPTH 8 |
| 34 | #include "h264dsp_template.c" | 35 | #include "h264dsp_template.c" |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include "bit_depth_template.c" | 28 | #include "bit_depth_template.c" |
| 29 | #include "libavutil/common.h" | ||
| 29 | 30 | ||
| 30 | #ifndef AVCODEC_H264IDCT_INTERNAL_H | 31 | #ifndef AVCODEC_H264IDCT_INTERNAL_H |
| 31 | #define AVCODEC_H264IDCT_INTERNAL_H | 32 | #define AVCODEC_H264IDCT_INTERNAL_H |
| @@ -49,6 +49,7 @@ · 48 unmodified lines | |||
| 49 | #include <string.h> | 49 | #include <string.h> |
| 50 | 50 | ||
| 51 | #include "avcodec.h" | 51 | #include "avcodec.h" |
| 52 | #include "libavutil/internal.h" | ||
| 52 | 53 | ||
| 53 | #define HUFFMAN_TABLE_SIZE 64 * 1024 | 54 | #define HUFFMAN_TABLE_SIZE 64 * 1024 |
| 54 | #define HUF_TOKENS 256 | 55 | #define HUF_TOKENS 256 |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | 26 | ||
| 27 | #include "iirfilter.h" | 27 | #include "iirfilter.h" |
| 28 | #include <math.h> | 28 | #include <math.h> |
| 29 | #include "libavutil/common.h" | ||
| 29 | 30 | ||
| 30 | /** | 31 | /** |
| 31 | * IIR filter global parameters | 32 | * IIR filter global parameters |
| @@ -35,6 +35,7 @@ · 34 unmodified lines | |||
| 35 | #include "internal.h" | 35 | #include "internal.h" |
| 36 | #include "imgconvert.h" | 36 | #include "imgconvert.h" |
| 37 | #include "libavutil/colorspace.h" | 37 | #include "libavutil/colorspace.h" |
| 38 | #include "libavutil/common.h" | ||
| 38 | #include "libavutil/pixdesc.h" | 39 | #include "libavutil/pixdesc.h" |
| 39 | #include "libavutil/imgutils.h" | 40 | #include "libavutil/imgutils.h" |
| 40 | 41 | ||
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include "dsputil.h" | 24 | #include "dsputil.h" |
| 25 | #include "libavutil/common.h" | ||
| 25 | 26 | ||
| 26 | /* | 27 | /* |
| 27 | area positions, #3 is 1 pixel only, other are 8 pixels | 28 | area positions, #3 is 1 pixel only, other are 8 pixels |
| @@ -29,6 +29,7 @@ · 28 unmodified lines | |||
| 29 | #define AVCODEC_JPEGLS_H | 29 | #define AVCODEC_JPEGLS_H |
| 30 | 30 | ||
| 31 | #include "avcodec.h" | 31 | #include "avcodec.h" |
| 32 | #include "libavutil/common.h" | ||
| 32 | 33 | ||
| 33 | typedef struct JpeglsContext{ | 34 | typedef struct JpeglsContext{ |
| 34 | AVCodecContext *avctx; | 35 | AVCodecContext *avctx; |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | * Kega Game Video decoder | 24 | * Kega Game Video decoder |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "libavutil/common.h" | ||
| 27 | #include "libavutil/intreadwrite.h" | 28 | #include "libavutil/intreadwrite.h" |
| 28 | #include "libavutil/imgutils.h" | 29 | #include "libavutil/imgutils.h" |
| 29 | #include "avcodec.h" | 30 | #include "avcodec.h" |
| @@ -45,6 +45,8 @@ · 44 unmodified lines | |||
| 45 | #include "avcodec.h" | 45 | #include "avcodec.h" |
| 46 | #include "internal.h" | 46 | #include "internal.h" |
| 47 | #include "lcl.h" | 47 | #include "lcl.h" |
| 48 | #include "libavutil/internal.h" | ||
| 49 | #include "libavutil/mem.h" | ||
| 48 | 50 | ||
| 49 | #include <zlib.h> | 51 | #include <zlib.h> |
| 50 | 52 | ||
| @@ -30,6 +30,7 @@ · 29 unmodified lines | |||
| 30 | #include "audio_frame_queue.h" | 30 | #include "audio_frame_queue.h" |
| 31 | #include "internal.h" | 31 | #include "internal.h" |
| 32 | #include "libavutil/audioconvert.h" | 32 | #include "libavutil/audioconvert.h" |
| 33 | #include "libavutil/common.h" | ||
| 33 | 34 | ||
| 34 | 35 | ||
| 35 | /* libfaac has an encoder delay of 1024 samples */ | 36 | /* libfaac has an encoder delay of 1024 samples */ |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | #include "audio_frame_queue.h" | 25 | #include "audio_frame_queue.h" |
| 26 | #include "internal.h" | 26 | #include "internal.h" |
| 27 | #include "libavutil/audioconvert.h" | 27 | #include "libavutil/audioconvert.h" |
| 28 | #include "libavutil/common.h" | ||
| 28 | #include "libavutil/opt.h" | 29 | #include "libavutil/opt.h" |
| 29 | 30 | ||
| 30 | typedef struct AACContext { | 31 | typedef struct AACContext { |
| @@ -32,6 +32,7 @@ · 31 unmodified lines | |||
| 32 | #include "avcodec.h" | 32 | #include "avcodec.h" |
| 33 | #include "internal.h" | 33 | #include "internal.h" |
| 34 | #include "gsm.h" | 34 | #include "gsm.h" |
| 35 | #include "libavutil/common.h" | ||
| 35 | 36 | ||
| 36 | static av_cold int libgsm_encode_close(AVCodecContext *avctx) { | 37 | static av_cold int libgsm_encode_close(AVCodecContext *avctx) { |
| 37 | #if FF_API_OLD_ENCODE_AUDIO | 38 | #if FF_API_OLD_ENCODE_AUDIO |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include <ilbc.h> | 22 | #include <ilbc.h> |
| 23 | 23 | ||
| 24 | #include "avcodec.h" | 24 | #include "avcodec.h" |
| 25 | #include "libavutil/common.h" | ||
| 25 | #include "libavutil/opt.h" | 26 | #include "libavutil/opt.h" |
| 26 | #include "internal.h" | 27 | #include "internal.h" |
| 27 | 28 | ||
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include <lame/lame.h> | 27 | #include <lame/lame.h> |
| 28 | 28 | ||
| 29 | #include "libavutil/audioconvert.h" | 29 | #include "libavutil/audioconvert.h" |
| 30 | #include "libavutil/common.h" | ||
| 30 | #include "libavutil/intreadwrite.h" | 31 | #include "libavutil/intreadwrite.h" |
| 31 | #include "libavutil/log.h" | 32 | #include "libavutil/log.h" |
| 32 | #include "libavutil/opt.h" | 33 | #include "libavutil/opt.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include "avcodec.h" | 22 | #include "avcodec.h" |
| 23 | #include "libavutil/avstring.h" | 23 | #include "libavutil/avstring.h" |
| 24 | #include "libavutil/common.h" | ||
| 24 | #include "libavutil/opt.h" | 25 | #include "libavutil/opt.h" |
| 25 | #include "audio_frame_queue.h" | 26 | #include "audio_frame_queue.h" |
| 26 | #include "internal.h" | 27 | #include "internal.h" |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include <speex/speex_stereo.h> | 23 | #include <speex/speex_stereo.h> |
| 24 | #include <speex/speex_callbacks.h> | 24 | #include <speex/speex_callbacks.h> |
| 25 | #include "avcodec.h" | 25 | #include "avcodec.h" |
| 26 | #include "libavutil/common.h" | ||
| 26 | 27 | ||
| 27 | typedef struct { | 28 | typedef struct { |
| 28 | AVFrame frame; | 29 | AVFrame frame; |
| @@ -69,6 +69,7 @@ · 68 unmodified lines | |||
| 69 | #include <speex/speex_stereo.h> | 69 | #include <speex/speex_stereo.h> |
| 70 | 70 | ||
| 71 | #include "libavutil/audioconvert.h" | 71 | #include "libavutil/audioconvert.h" |
| 72 | #include "libavutil/common.h" | ||
| 72 | #include "libavutil/opt.h" | 73 | #include "libavutil/opt.h" |
| 73 | #include "avcodec.h" | 74 | #include "avcodec.h" |
| 74 | #include "internal.h" | 75 | #include "internal.h" |
| @@ -31,6 +31,7 @@ · 30 unmodified lines | |||
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | /* FFmpeg includes */ | 33 | /* FFmpeg includes */ |
| 34 | #include "libavutil/common.h" | ||
| 34 | #include "libavutil/intreadwrite.h" | 35 | #include "libavutil/intreadwrite.h" |
| 35 | #include "libavutil/log.h" | 36 | #include "libavutil/log.h" |
| 36 | #include "libavutil/base64.h" | 37 | #include "libavutil/base64.h" |
| @@ -20,8 +20,12 @@ · 19 unmodified lines | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <vo-amrwbenc/enc_if.h> | 22 | #include <vo-amrwbenc/enc_if.h> |
| 23 | #include <stdio.h> | ||
| 24 | #include <stdlib.h> | ||
| 23 | 25 | ||
| 24 | #include "libavutil/avstring.h" | 26 | #include "libavutil/avstring.h" |
| 27 | #include "libavutil/internal.h" | ||
| 28 | #include "libavutil/mem.h" | ||
| 25 | #include "libavutil/opt.h" | 29 | #include "libavutil/opt.h" |
| 26 | #include "avcodec.h" | 30 | #include "avcodec.h" |
| 27 | #include "internal.h" | 31 | #include "internal.h" |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include <vpx/vpx_decoder.h> | 27 | #include <vpx/vpx_decoder.h> |
| 28 | #include <vpx/vp8dx.h> | 28 | #include <vpx/vp8dx.h> |
| 29 | 29 | ||
| 30 | #include "libavutil/common.h" | ||
| 30 | #include "libavutil/imgutils.h" | 31 | #include "libavutil/imgutils.h" |
| 31 | #include "avcodec.h" | 32 | #include "avcodec.h" |
| 32 | 33 | ||
| @@ -32,6 +32,7 @@ · 31 unmodified lines | |||
| 32 | #include "internal.h" | 32 | #include "internal.h" |
| 33 | #include "libavutil/avassert.h" | 33 | #include "libavutil/avassert.h" |
| 34 | #include "libavutil/base64.h" | 34 | #include "libavutil/base64.h" |
| 35 | #include "libavutil/common.h" | ||
| 35 | #include "libavutil/mathematics.h" | 36 | #include "libavutil/mathematics.h" |
| 36 | #include "libavutil/opt.h" | 37 | #include "libavutil/opt.h" |
| 37 | 38 | ||
| @@ -19,7 +19,9 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/internal.h" | ||
| 22 | #include "libavutil/opt.h" | 23 | #include "libavutil/opt.h" |
| 24 | #include "libavutil/mem.h" | ||
| 23 | #include "libavutil/pixdesc.h" | 25 | #include "libavutil/pixdesc.h" |
| 24 | #include "avcodec.h" | 26 | #include "avcodec.h" |
| 25 | #include "internal.h" | 27 | #include "internal.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/common.h" | ||
| 22 | #include "libavutil/lls.h" | 23 | #include "libavutil/lls.h" |
| 23 | 24 | ||
| 24 | #define LPC_USE_DOUBLE | 25 | #define LPC_USE_DOUBLE |
| @@ -29,6 +29,7 @@ · 28 unmodified lines | |||
| 29 | 29 | ||
| 30 | #include "avcodec.h" | 30 | #include "avcodec.h" |
| 31 | #include "lzw.h" | 31 | #include "lzw.h" |
| 32 | #include "libavutil/mem.h" | ||
| 32 | 33 | ||
| 33 | #define LZW_MAXBITS 12 | 34 | #define LZW_MAXBITS 12 |
| 34 | #define LZW_SIZTABLE (1<<LZW_MAXBITS) | 35 | #define LZW_SIZTABLE (1<<LZW_MAXBITS) |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "avcodec.h" | 27 | #include "avcodec.h" |
| 28 | #include "libavutil/common.h" | ||
| 28 | 29 | ||
| 29 | /* | 30 | /* |
| 30 | * Adapted to libavcodec by Francois Revol <revol@free.fr> | 31 | * Adapted to libavcodec by Francois Revol <revol@free.fr> |
| @@ -31,7 +31,9 @@ · 30 unmodified lines | |||
| 31 | 31 | ||
| 32 | #include "config.h" | 32 | #include "config.h" |
| 33 | #include "dsputil.h" | 33 | #include "dsputil.h" |
| 34 | #include "libavutil/internal.h" | ||
| 34 | #include "libavutil/lfg.h" | 35 | #include "libavutil/lfg.h" |
| 36 | #include "libavutil/mem.h" | ||
| 35 | #include "libavutil/time.h" | 37 | #include "libavutil/time.h" |
| 36 | 38 | ||
| 37 | #undef printf | 39 | #undef printf |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/common.h" | ||
| 21 | #include "libavutil/intreadwrite.h" | 22 | #include "libavutil/intreadwrite.h" |
| 22 | #include "avcodec.h" | 23 | #include "avcodec.h" |
| 23 | 24 | ||
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/common.h" | ||
| 21 | #include "libavutil/intreadwrite.h" | 22 | #include "libavutil/intreadwrite.h" |
| 22 | #include "avcodec.h" | 23 | #include "avcodec.h" |
| 23 | #include "mpegaudiodecheader.h" | 24 | #include "mpegaudiodecheader.h" |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/common.h" | ||
| 21 | #include "libavutil/intreadwrite.h" | 22 | #include "libavutil/intreadwrite.h" |
| 22 | #include "avcodec.h" | 23 | #include "avcodec.h" |
| 23 | #include "mpegaudiodecheader.h" | 24 | #include "mpegaudiodecheader.h" |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | #include "parser.h" | 23 | #include "parser.h" |
| 24 | #include "mpegaudiodecheader.h" | 24 | #include "mpegaudiodecheader.h" |
| 25 | #include "libavutil/common.h" | ||
| 25 | 26 | ||
| 26 | 27 | ||
| 27 | typedef struct MpegAudioParseContext { | 28 | typedef struct MpegAudioParseContext { |
| @@ -31,6 +31,7 @@ · 30 unmodified lines | |||
| 31 | #include <stdlib.h> | 31 | #include <stdlib.h> |
| 32 | #include <string.h> | 32 | #include <string.h> |
| 33 | 33 | ||
| 34 | #include "libavutil/internal.h" | ||
| 34 | #include "libavutil/intreadwrite.h" | 35 | #include "libavutil/intreadwrite.h" |
| 35 | #include "avcodec.h" | 36 | #include "avcodec.h" |
| 36 | 37 | ||
| @@ -18,7 +18,11 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <stdlib.h> | ||
| 22 | #include <string.h> | ||
| 23 | |||
| 21 | #include "avcodec.h" | 24 | #include "avcodec.h" |
| 25 | #include "libavutil/mem.h" | ||
| 22 | 26 | ||
| 23 | 27 | ||
| 24 | static int noise(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args, | 28 | static int noise(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args, |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include <limits.h> | 24 | #include <limits.h> |
| 25 | 25 | ||
| 26 | #include "libavutil/bswap.h" | 26 | #include "libavutil/bswap.h" |
| 27 | #include "libavutil/common.h" | ||
| 27 | #include "libavutil/lzo.h" | 28 | #include "libavutil/lzo.h" |
| 28 | #include "libavutil/imgutils.h" | 29 | #include "libavutil/imgutils.h" |
| 29 | #include "avcodec.h" | 30 | #include "avcodec.h" |
| @@ -27,8 +27,10 @@ · 26 unmodified lines | |||
| 27 | #include "avcodec.h" | 27 | #include "avcodec.h" |
| 28 | #include "internal.h" | 28 | #include "internal.h" |
| 29 | #include "libavutil/avassert.h" | 29 | #include "libavutil/avassert.h" |
| 30 | #include "libavutil/mem.h" | ||
| 30 | #include "libavutil/opt.h" | 31 | #include "libavutil/opt.h" |
| 31 | #include <float.h> /* FLT_MIN, FLT_MAX */ | 32 | #include <float.h> /* FLT_MIN, FLT_MAX */ |
| 33 | #include <string.h> | ||
| 32 | 34 | ||
| 33 | #include "options_table.h" | 35 | #include "options_table.h" |
| 34 | 36 | ||
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | 27 | ||
| 28 | #include "libavutil/opt.h" | 28 | #include "libavutil/opt.h" |
| 29 | #include "avcodec.h" | 29 | #include "avcodec.h" |
| 30 | #include "config.h" | ||
| 30 | 31 | ||
| 31 | #define OFFSET(x) offsetof(AVCodecContext,x) | 32 | #define OFFSET(x) offsetof(AVCodecContext,x) |
| 32 | #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 | 33 | #define DEFAULT 0 //should be NAN but it does not work as it is not a constant in glibc as required by ANSI/ISO C |
| @@ -20,7 +20,10 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <string.h> | ||
| 24 | |||
| 23 | #include "parser.h" | 25 | #include "parser.h" |
| 26 | #include "libavutil/mem.h" | ||
| 24 | 27 | ||
| 25 | static AVCodecParser *av_first_parser = NULL; | 28 | static AVCodecParser *av_first_parser = NULL; |
| 26 | 29 | ||
| @@ -19,6 +19,9 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <stdlib.h> | ||
| 23 | #include <string.h> | ||
| 24 | |||
| 22 | #include "libavutil/imgutils.h" | 25 | #include "libavutil/imgutils.h" |
| 23 | #include "avcodec.h" | 26 | #include "avcodec.h" |
| 24 | #include "pnm.h" | 27 | #include "pnm.h" |
| @@ -20,7 +20,10 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <string.h> | ||
| 24 | |||
| 23 | #include "libavutil/cpu.h" | 25 | #include "libavutil/cpu.h" |
| 26 | #include "libavutil/mem.h" | ||
| 24 | #include "libavcodec/dsputil.h" | 27 | #include "libavcodec/dsputil.h" |
| 25 | #include "dsputil_altivec.h" | 28 | #include "dsputil_altivec.h" |
| 26 | 29 | ||
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | #include "libavcodec/fmtconvert.h" | 21 | #include "libavcodec/fmtconvert.h" |
| 22 | 22 | ||
| 23 | #include "libavutil/ppc/util_altivec.h" | 23 | #include "libavutil/ppc/util_altivec.h" |
| 24 | #include "libavutil/mem.h" | ||
| 24 | #include "dsputil_altivec.h" | 25 | #include "dsputil_altivec.h" |
| 25 | 26 | ||
| 26 | static void int32_to_float_fmul_scalar_altivec(float *dst, const int *src, | 27 | static void int32_to_float_fmul_scalar_altivec(float *dst, const int *src, |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include "libavutil/mem.h" | ||
| 23 | #include "libavutil/ppc/types_altivec.h" | 24 | #include "libavutil/ppc/types_altivec.h" |
| 24 | #include "libavutil/ppc/util_altivec.h" | 25 | #include "libavutil/ppc/util_altivec.h" |
| 25 | #include "libavcodec/dsputil.h" | 26 | #include "libavcodec/dsputil.h" |
| @@ -18,6 +18,8 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/mem.h" | ||
| 22 | |||
| 21 | #ifdef DEBUG | 23 | #ifdef DEBUG |
| 22 | #define ASSERT_ALIGNED(ptr) assert(((unsigned long)ptr&0x0000000F)); | 24 | #define ASSERT_ALIGNED(ptr) assert(((unsigned long)ptr&0x0000000F)); |
| 23 | #else | 25 | #else |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include "libavutil/cpu.h" | 23 | #include "libavutil/cpu.h" |
| 24 | #include "libavutil/mem.h" | ||
| 24 | #include "libavutil/ppc/types_altivec.h" | 25 | #include "libavutil/ppc/types_altivec.h" |
| 25 | #include "libavutil/ppc/util_altivec.h" | 26 | #include "libavutil/ppc/util_altivec.h" |
| 26 | #include "libavcodec/vp8dsp.h" | 27 | #include "libavcodec/vp8dsp.h" |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | #include "proresdsp.h" | 23 | #include "proresdsp.h" |
| 24 | #include "simple_idct.h" | 24 | #include "simple_idct.h" |
| 25 | #include "libavutil/common.h" | ||
| 25 | 26 | ||
| 26 | #define BIAS (1 << (PRORES_BITS_PER_SAMPLE - 1)) ///< bias value for converting signed pixels into unsigned ones | 27 | #define BIAS (1 << (PRORES_BITS_PER_SAMPLE - 1)) ///< bias value for converting signed pixels into unsigned ones |
| 27 | #define CLIP_MIN (1 << (PRORES_BITS_PER_SAMPLE - 8)) ///< minimum value for clipping resulting pixels | 28 | #define CLIP_MIN (1 << (PRORES_BITS_PER_SAMPLE - 8)) ///< minimum value for clipping resulting pixels |
| @@ -19,9 +19,12 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <string.h> | ||
| 23 | |||
| 22 | #include "avcodec.h" | 24 | #include "avcodec.h" |
| 23 | #include "psymodel.h" | 25 | #include "psymodel.h" |
| 24 | #include "iirfilter.h" | 26 | #include "iirfilter.h" |
| 27 | #include "libavutil/mem.h" | ||
| 25 | 28 | ||
| 26 | extern const FFPsyModel ff_aac_psy_model; | 29 | extern const FFPsyModel ff_aac_psy_model; |
| 27 | 30 | ||
| @@ -53,6 +53,7 @@ · 52 unmodified lines | |||
| 53 | #include "avcodec.h" | 53 | #include "avcodec.h" |
| 54 | #include "internal.h" | 54 | #include "internal.h" |
| 55 | #include "thread.h" | 55 | #include "thread.h" |
| 56 | #include "libavutil/common.h" | ||
| 56 | 57 | ||
| 57 | #if HAVE_PTHREADS | 58 | #if HAVE_PTHREADS |
| 58 | #include <pthread.h> | 59 | #include <pthread.h> |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/common.h" | ||
| 22 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 23 | #include "libavutil/imgutils.h" | 24 | #include "libavutil/imgutils.h" |
| 24 | #include "avcodec.h" | 25 | #include "avcodec.h" |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | * Apple QuickDraw codec. | 24 | * Apple QuickDraw codec. |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "libavutil/common.h" | ||
| 27 | #include "libavutil/intreadwrite.h" | 28 | #include "libavutil/intreadwrite.h" |
| 28 | #include "avcodec.h" | 29 | #include "avcodec.h" |
| 29 | 30 | ||
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | #include "avcodec.h" | 23 | #include "avcodec.h" |
| 24 | #include "libavutil/bswap.h" | 24 | #include "libavutil/bswap.h" |
| 25 | #include "libavutil/common.h" | ||
| 25 | 26 | ||
| 26 | static av_cold int decode_init(AVCodecContext *avctx) | 27 | static av_cold int decode_init(AVCodecContext *avctx) |
| 27 | { | 28 | { |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include "avcodec.h" | 23 | #include "avcodec.h" |
| 24 | #include "celp_filters.h" | 24 | #include "celp_filters.h" |
| 25 | #include "ra144.h" | 25 | #include "ra144.h" |
| 26 | #include "libavutil/common.h" | ||
| 26 | 27 | ||
| 27 | const int16_t ff_gain_val_tab[256][3] = { | 28 | const int16_t ff_gain_val_tab[256][3] = { |
| 28 | { 541, 956, 768}, { 877, 581, 568}, { 675,1574, 635}, {1248,1464, 668}, | 29 | { 541, 956, 768}, { 877, 581, 568}, { 675,1574, 635}, {1248,1464, 668}, |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | #include <stdint.h> | 25 | #include <stdint.h> |
| 26 | #include "dsputil.h" | 26 | #include "dsputil.h" |
| 27 | #include "libavutil/common.h" | ||
| 27 | 28 | ||
| 28 | static const float amptable[8]={ | 29 | static const float amptable[8]={ |
| 29 | 0.515625, 0.90234375, 1.57910156, 2.76342773, | 30 | 0.515625, 0.90234375, 1.57910156, 2.76342773, |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | 26 | ||
| 27 | #include "avcodec.h" | 27 | #include "avcodec.h" |
| 28 | #include "raw.h" | 28 | #include "raw.h" |
| 29 | #include "libavutil/common.h" | ||
| 29 | 30 | ||
| 30 | const PixelFormatTag ff_raw_pix_fmt_tags[] = { | 31 | const PixelFormatTag ff_raw_pix_fmt_tags[] = { |
| 31 | { PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */ | 32 | { PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */ |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | #include "imgconvert.h" | 28 | #include "imgconvert.h" |
| 29 | #include "raw.h" | 29 | #include "raw.h" |
| 30 | #include "libavutil/avassert.h" | 30 | #include "libavutil/avassert.h" |
| 31 | #include "libavutil/common.h" | ||
| 31 | #include "libavutil/intreadwrite.h" | 32 | #include "libavutil/intreadwrite.h" |
| 32 | #include "libavutil/imgutils.h" | 33 | #include "libavutil/imgutils.h" |
| 33 | #include "libavutil/opt.h" | 34 | #include "libavutil/opt.h" |
| @@ -29,6 +29,7 @@ · 28 unmodified lines | |||
| 29 | #include "internal.h" | 29 | #include "internal.h" |
| 30 | #include "libavutil/pixdesc.h" | 30 | #include "libavutil/pixdesc.h" |
| 31 | #include "libavutil/intreadwrite.h" | 31 | #include "libavutil/intreadwrite.h" |
| 32 | #include "libavutil/internal.h" | ||
| 32 | 33 | ||
| 33 | static av_cold int raw_init_encoder(AVCodecContext *avctx) | 34 | static av_cold int raw_init_encoder(AVCodecContext *avctx) |
| 34 | { | 35 | { |
| @@ -24,9 +24,12 @@ · 23 unmodified lines | |||
| 24 | * samplerate conversion for both audio and video | 24 | * samplerate conversion for both audio and video |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <string.h> | ||
| 28 | |||
| 27 | #include "avcodec.h" | 29 | #include "avcodec.h" |
| 28 | #include "audioconvert.h" | 30 | #include "audioconvert.h" |
| 29 | #include "libavutil/opt.h" | 31 | #include "libavutil/opt.h" |
| 32 | #include "libavutil/mem.h" | ||
| 30 | #include "libavutil/samplefmt.h" | 33 | #include "libavutil/samplefmt.h" |
| 31 | 34 | ||
| 32 | #define MAX_CHANNELS 8 | 35 | #define MAX_CHANNELS 8 |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | #include "libavutil/avassert.h" | 28 | #include "libavutil/avassert.h" |
| 29 | #include "avcodec.h" | 29 | #include "avcodec.h" |
| 30 | #include "dsputil.h" | 30 | #include "dsputil.h" |
| 31 | #include "libavutil/common.h" | ||
| 31 | 32 | ||
| 32 | #ifndef CONFIG_RESAMPLE_HP | 33 | #ifndef CONFIG_RESAMPLE_HP |
| 33 | #define FILTER_SHIFT 15 | 34 | #define FILTER_SHIFT 15 |
| @@ -30,7 +30,9 @@ · 29 unmodified lines | |||
| 30 | #include <stdlib.h> | 30 | #include <stdlib.h> |
| 31 | #include <string.h> | 31 | #include <string.h> |
| 32 | 32 | ||
| 33 | #include "libavutil/internal.h" | ||
| 33 | #include "libavutil/intreadwrite.h" | 34 | #include "libavutil/intreadwrite.h" |
| 35 | #include "libavutil/mem.h" | ||
| 34 | #include "avcodec.h" | 36 | #include "avcodec.h" |
| 35 | 37 | ||
| 36 | 38 | ||
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | */ | 20 | */ |
| 21 | #include "avcodec.h" | 21 | #include "avcodec.h" |
| 22 | #include "rle.h" | 22 | #include "rle.h" |
| 23 | #include "libavutil/common.h" | ||
| 23 | 24 | ||
| 24 | /** | 25 | /** |
| 25 | * Count up to 127 consecutive pixels which are either all the same or | 26 | * Count up to 127 consecutive pixels which are either all the same or |
| @@ -38,6 +38,7 @@ · 37 unmodified lines | |||
| 38 | #include <stdlib.h> | 38 | #include <stdlib.h> |
| 39 | #include <string.h> | 39 | #include <string.h> |
| 40 | 40 | ||
| 41 | #include "libavutil/internal.h" | ||
| 41 | #include "libavutil/intreadwrite.h" | 42 | #include "libavutil/intreadwrite.h" |
| 42 | #include "avcodec.h" | 43 | #include "avcodec.h" |
| 43 | 44 | ||
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | #include <stdint.h> | 25 | #include <stdint.h> |
| 26 | #include "dsputil.h" | 26 | #include "dsputil.h" |
| 27 | #include "libavutil/mem.h" | ||
| 27 | 28 | ||
| 28 | #define RTJPEG_FILE_VERSION 0 | 29 | #define RTJPEG_FILE_VERSION 0 |
| 29 | #define RTJPEG_HEADER_SIZE 12 | 30 | #define RTJPEG_HEADER_SIZE 12 |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | */ | 26 | */ |
| 27 | #include "dsputil.h" | 27 | #include "dsputil.h" |
| 28 | #include "rv34dsp.h" | 28 | #include "rv34dsp.h" |
| 29 | #include "libavutil/common.h" | ||
| 29 | 30 | ||
| 30 | /** | 31 | /** |
| 31 | * @name RV30/40 inverse transform functions | 32 | * @name RV30/40 inverse transform functions |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | #include "dsputil.h" | 28 | #include "dsputil.h" |
| 29 | #include "rv34dsp.h" | 29 | #include "rv34dsp.h" |
| 30 | #include "libavutil/avassert.h" | 30 | #include "libavutil/avassert.h" |
| 31 | #include "libavutil/common.h" | ||
| 31 | 32 | ||
| 32 | #define RV40_LOWPASS(OPNAME, OP) \ | 33 | #define RV40_LOWPASS(OPNAME, OP) \ |
| 33 | static av_unused void OPNAME ## rv40_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\ | 34 | static av_unused void OPNAME ## rv40_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\ |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include "libavutil/common.h" | ||
| 23 | #include "libavutil/intreadwrite.h" | 24 | #include "libavutil/intreadwrite.h" |
| 24 | #include "avcodec.h" | 25 | #include "avcodec.h" |
| 25 | 26 | ||
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | // for the host and the target and config.h is only valid for the target | 28 | // for the host and the target and config.h is only valid for the target |
| 29 | #include <math.h> | 29 | #include <math.h> |
| 30 | #include "libavutil/attributes.h" | 30 | #include "libavutil/attributes.h" |
| 31 | #include "libavutil/common.h" | ||
| 31 | 32 | ||
| 32 | #if !CONFIG_HARDCODED_TABLES | 33 | #if !CONFIG_HARDCODED_TABLES |
| 33 | SINETABLE( 32); | 34 | SINETABLE( 32); |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include "avcodec.h" | 27 | #include "avcodec.h" |
| 28 | #include "dsputil.h" | 28 | #include "dsputil.h" |
| 29 | #include "acelp_pitch_delay.h" | 29 | #include "acelp_pitch_delay.h" |
| 30 | #include "libavutil/mem.h" | ||
| 30 | 31 | ||
| 31 | #define LP_FILTER_ORDER_16k 16 | 32 | #define LP_FILTER_ORDER_16k 16 |
| 32 | #define L_SUBFR_16k 80 | 33 | #define L_SUBFR_16k 80 |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include <math.h> | 24 | #include <math.h> |
| 25 | 25 | ||
| 26 | #include "sipr.h" | 26 | #include "sipr.h" |
| 27 | #include "libavutil/common.h" | ||
| 27 | #include "libavutil/mathematics.h" | 28 | #include "libavutil/mathematics.h" |
| 28 | #include "lsp.h" | 29 | #include "lsp.h" |
| 29 | #include "celp_math.h" | 30 | #include "celp_math.h" |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include <inttypes.h> | 27 | #include <inttypes.h> |
| 28 | 28 | ||
| 29 | #include "libavcodec/dsputil.h" | 29 | #include "libavcodec/dsputil.h" |
| 30 | #include "libavutil/mem.h" | ||
| 30 | #include "dsputil_vis.h" | 31 | #include "dsputil_vis.h" |
| 31 | 32 | ||
| 32 | #include "vis.h" | 33 | #include "vis.h" |
| @@ -22,8 +22,11 @@ · 21 unmodified lines | |||
| 22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <stdint.h> | ||
| 26 | |||
| 25 | #include "libavcodec/dsputil.h" | 27 | #include "libavcodec/dsputil.h" |
| 26 | #include "dsputil_vis.h" | 28 | #include "dsputil_vis.h" |
| 29 | #include "libavutil/mem.h" | ||
| 27 | 30 | ||
| 28 | static const DECLARE_ALIGNED(8, int16_t, coeffs)[28] = { | 31 | static const DECLARE_ALIGNED(8, int16_t, coeffs)[28] = { |
| 29 | - 1259,- 1259,- 1259,- 1259, | 32 | - 1259,- 1259,- 1259,- 1259, |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/avstring.h" | 22 | #include "libavutil/avstring.h" |
| 23 | #include "libavutil/common.h" | ||
| 23 | #include "libavutil/parseutils.h" | 24 | #include "libavutil/parseutils.h" |
| 24 | #include "avcodec.h" | 25 | #include "avcodec.h" |
| 25 | #include "ass.h" | 26 | #include "ass.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/common.h" | ||
| 22 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 23 | #include "libavutil/imgutils.h" | 24 | #include "libavutil/imgutils.h" |
| 24 | #include "avcodec.h" | 25 | #include "avcodec.h" |
| @@ -19,6 +19,9 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <string.h> | ||
| 23 | |||
| 24 | #include "libavutil/internal.h" | ||
| 22 | #include "libavutil/intreadwrite.h" | 25 | #include "libavutil/intreadwrite.h" |
| 23 | #include "libavutil/pixdesc.h" | 26 | #include "libavutil/pixdesc.h" |
| 24 | #include "avcodec.h" | 27 | #include "avcodec.h" |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | 26 | ||
| 27 | #include "avcodec.h" | 27 | #include "avcodec.h" |
| 28 | #include "bytestream.h" | 28 | #include "bytestream.h" |
| 29 | #include "config.h" | ||
| 29 | #if CONFIG_ZLIB | 30 | #if CONFIG_ZLIB |
| 30 | #include <zlib.h> | 31 | #include <zlib.h> |
| 31 | #endif | 32 | #endif |
| @@ -30,12 +30,12 @@ · 29 unmodified lines | |||
| 30 | #include "libavutil/opt.h" | 30 | #include "libavutil/opt.h" |
| 31 | 31 | ||
| 32 | #include "avcodec.h" | 32 | #include "avcodec.h" |
| 33 | #include "internal.h" | 33 | #include "config.h" |
| 34 | #if CONFIG_ZLIB | 34 | #if CONFIG_ZLIB |
| 35 | #include <zlib.h> | 35 | #include <zlib.h> |
| 36 | #endif | 36 | #endif |
| 37 | #include "libavutil/opt.h" | ||
| 38 | #include "bytestream.h" | 37 | #include "bytestream.h" |
| 38 | #include "internal.h" | ||
| 39 | #include "tiff.h" | 39 | #include "tiff.h" |
| 40 | #include "rle.h" | 40 | #include "rle.h" |
| 41 | #include "lzw.h" | 41 | #include "lzw.h" |
| @@ -26,7 +26,10 @@ · 25 unmodified lines | |||
| 26 | * @see http://www.oldskool.org/pc/8088_Corruption | 26 | * @see http://www.oldskool.org/pc/8088_Corruption |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <string.h> | ||
| 30 | |||
| 29 | #include "avcodec.h" | 31 | #include "avcodec.h" |
| 32 | #include "libavutil/internal.h" | ||
| 30 | 33 | ||
| 31 | #include "cga_data.h" | 34 | #include "cga_data.h" |
| 32 | 35 | ||
| @@ -36,6 +36,8 @@ · 35 unmodified lines | |||
| 36 | #include "avcodec.h" | 36 | #include "avcodec.h" |
| 37 | #include "dsputil.h" | 37 | #include "dsputil.h" |
| 38 | #include "libavutil/imgutils.h" | 38 | #include "libavutil/imgutils.h" |
| 39 | #include "libavutil/internal.h" | ||
| 40 | #include "libavutil/mem.h" | ||
| 39 | 41 | ||
| 40 | #include "truemotion1data.h" | 42 | #include "truemotion1data.h" |
| 41 | 43 | ||
| @@ -24,6 +24,8 @@ · 23 unmodified lines | |||
| 24 | #include "avcodec.h" | 24 | #include "avcodec.h" |
| 25 | #include "v210dec.h" | 25 | #include "v210dec.h" |
| 26 | #include "libavutil/bswap.h" | 26 | #include "libavutil/bswap.h" |
| 27 | #include "libavutil/internal.h" | ||
| 28 | #include "libavutil/mem.h" | ||
| 27 | 29 | ||
| 28 | #define READ_PIXELS(a, b, c) \ | 30 | #define READ_PIXELS(a, b, c) \ |
| 29 | do { \ | 31 | do { \ |
| @@ -20,6 +20,8 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #include "avcodec.h" | 21 | #include "avcodec.h" |
| 22 | #include "libavutil/bswap.h" | 22 | #include "libavutil/bswap.h" |
| 23 | #include "libavutil/internal.h" | ||
| 24 | #include "libavutil/mem.h" | ||
| 23 | 25 | ||
| 24 | static av_cold int decode_init(AVCodecContext *avctx) | 26 | static av_cold int decode_init(AVCodecContext *avctx) |
| 25 | { | 27 | { |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include "libavutil/common.h" | ||
| 23 | #include "libavutil/intreadwrite.h" | 24 | #include "libavutil/intreadwrite.h" |
| 24 | #include "avcodec.h" | 25 | #include "avcodec.h" |
| 25 | 26 | ||
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include "libavutil/common.h" | ||
| 23 | #include "libavutil/intreadwrite.h" | 24 | #include "libavutil/intreadwrite.h" |
| 24 | #include "avcodec.h" | 25 | #include "avcodec.h" |
| 25 | #include "internal.h" | 26 | #include "internal.h" |
| @@ -27,6 +27,8 @@ · 26 unmodified lines | |||
| 27 | 27 | ||
| 28 | #include "vc1dsp.h" | 28 | #include "vc1dsp.h" |
| 29 | #include "libavutil/avassert.h" | 29 | #include "libavutil/avassert.h" |
| 30 | #include "libavutil/common.h" | ||
| 31 | |||
| 30 | 32 | ||
| 31 | /** Apply overlap transform to horizontal edge | 33 | /** Apply overlap transform to horizontal edge |
| 32 | */ | 34 | */ |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | 26 | ||
| 27 | #include "avcodec.h" | 27 | #include "avcodec.h" |
| 28 | #include "dsputil.h" | 28 | #include "dsputil.h" |
| 29 | #include "libavutil/internal.h" | ||
| 29 | 30 | ||
| 30 | typedef struct VCR1Context { | 31 | typedef struct VCR1Context { |
| 31 | AVFrame picture; | 32 | AVFrame picture; |
| @@ -43,6 +43,7 @@ · 42 unmodified lines | |||
| 43 | #include <stdlib.h> | 43 | #include <stdlib.h> |
| 44 | #include <string.h> | 44 | #include <string.h> |
| 45 | 45 | ||
| 46 | #include "libavutil/common.h" | ||
| 46 | #include "libavutil/intreadwrite.h" | 47 | #include "libavutil/intreadwrite.h" |
| 47 | #include "avcodec.h" | 48 | #include "avcodec.h" |
| 48 | 49 | ||
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | #include <stdio.h> | 28 | #include <stdio.h> |
| 29 | #include <stdlib.h> | 29 | #include <stdlib.h> |
| 30 | 30 | ||
| 31 | #include "libavutil/common.h" | ||
| 31 | #include "libavutil/intreadwrite.h" | 32 | #include "libavutil/intreadwrite.h" |
| 32 | #include "avcodec.h" | 33 | #include "avcodec.h" |
| 33 | 34 | ||
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | #include "dsputil.h" | 21 | #include "dsputil.h" |
| 22 | #include "vorbis.h" | 22 | #include "vorbis.h" |
| 23 | #include "libavutil/audioconvert.h" | 23 | #include "libavutil/audioconvert.h" |
| 24 | #include "libavutil/mem.h" | ||
| 24 | 25 | ||
| 25 | const uint8_t ff_vorbis_channel_layout_offsets[8][8] = { | 26 | const uint8_t ff_vorbis_channel_layout_offsets[8][8] = { |
| 26 | { 0 }, | 27 | { 0 }, |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "libavutil/attributes.h" | 27 | #include "libavutil/attributes.h" |
| 28 | #include "libavutil/common.h" | ||
| 28 | #include "avcodec.h" | 29 | #include "avcodec.h" |
| 29 | #include "dsputil.h" | 30 | #include "dsputil.h" |
| 30 | #include "vp3dsp.h" | 31 | #include "vp3dsp.h" |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include <stdint.h> | 22 | #include <stdint.h> |
| 23 | #include "avcodec.h" | 23 | #include "avcodec.h" |
| 24 | #include "vp56dsp.h" | 24 | #include "vp56dsp.h" |
| 25 | #include "libavutil/common.h" | ||
| 25 | 26 | ||
| 26 | /* Gives very similar result than the vp6 version except in a few cases */ | 27 | /* Gives very similar result than the vp6 version except in a few cases */ |
| 27 | static int vp5_adjust(int v, int t) | 28 | static int vp5_adjust(int v, int t) |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | 26 | ||
| 27 | #include "dsputil.h" | 27 | #include "dsputil.h" |
| 28 | #include "vp8dsp.h" | 28 | #include "vp8dsp.h" |
| 29 | #include "libavutil/common.h" | ||
| 29 | 30 | ||
| 30 | // TODO: Maybe add dequant | 31 | // TODO: Maybe add dequant |
| 31 | static void vp8_luma_dc_wht_c(DCTELEM block[4][4][16], DCTELEM dc[16]) | 32 | static void vp8_luma_dc_wht_c(DCTELEM block[4][4][16], DCTELEM dc[16]) |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <stdint.h> | 22 | #include <stdint.h> |
| 23 | #include "libavutil/common.h" | ||
| 23 | #include "libavutil/intreadwrite.h" | 24 | #include "libavutil/intreadwrite.h" |
| 24 | #include "avcodec.h" | 25 | #include "avcodec.h" |
| 25 | 26 | ||
| @@ -25,9 +25,9 @@ MMX-OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o · 24 unmodified lines | |||
| 25 | MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o | 25 | MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o |
| 26 | MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o | 26 | MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o |
| 27 | MMX-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodec_mmx.o | 27 | MMX-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodec_mmx.o |
| 28 | MMX-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp-init.o | 28 | MMX-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o |
| 29 | MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp-init.o | 29 | MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp_init.o |
| 30 | MMX-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp-init.o | 30 | MMX-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp_init.o |
| 31 | MMX-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp_init.o | 31 | MMX-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp_init.o |
| 32 | MMX-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp_init.o \ | 32 | MMX-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp_init.o \ |
| 33 | x86/rv40dsp_init.o | 33 | x86/rv40dsp_init.o |
| @@ -35,7 +35,7 @@ MMX-OBJS-$(CONFIG_V210_DECODER) += x86/v210-init.o · 1 unmodified line | |||
| 35 | MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o | 35 | MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o |
| 36 | MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp56dsp_init.o | 36 | MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp56dsp_init.o |
| 37 | MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp_init.o | 37 | MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp_init.o |
| 38 | MMX-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp-init.o | 38 | MMX-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp_init.o |
| 39 | 39 | ||
| 40 | YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o | 40 | YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o |
| 41 | YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o | 41 | YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o |
| @@ -40,7 +40,10 @@ · 39 unmodified lines | |||
| 40 | */ | 40 | */ |
| 41 | 41 | ||
| 42 | #include <inttypes.h> | 42 | #include <inttypes.h> |
| 43 | |||
| 44 | #include "config.h" | ||
| 43 | #include "libavcodec/avcodec.h" | 45 | #include "libavcodec/avcodec.h" |
| 46 | #include "libavutil/mem.h" | ||
| 44 | #include "idct_xvid.h" | 47 | #include "idct_xvid.h" |
| 45 | 48 | ||
| 46 | #if HAVE_INLINE_ASM | 49 | #if HAVE_INLINE_ASM |
| @@ -39,6 +39,8 @@ · 38 unmodified lines | |||
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #include "libavcodec/dsputil.h" | 41 | #include "libavcodec/dsputil.h" |
| 42 | #include "libavutil/internal.h" | ||
| 43 | #include "libavutil/mem.h" | ||
| 42 | #include "libavutil/x86/asm.h" | 44 | #include "libavutil/x86/asm.h" |
| 43 | #include "idct_xvid.h" | 45 | #include "idct_xvid.h" |
| 44 | #include "dsputil_mmx.h" | 46 | #include "dsputil_mmx.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include "libavutil/x86/asm.h" | 22 | #include "libavutil/x86/asm.h" |
| 23 | #include "libavutil/cpu.h" | 23 | #include "libavutil/cpu.h" |
| 24 | #include "libavutil/internal.h" | ||
| 24 | #include "libavcodec/lpc.h" | 25 | #include "libavcodec/lpc.h" |
| 25 | 26 | ||
| 26 | #if HAVE_INLINE_ASM | 27 | #if HAVE_INLINE_ASM |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/internal.h" | ||
| 22 | #include "libavutil/x86/asm.h" | 23 | #include "libavutil/x86/asm.h" |
| 23 | #include "libavcodec/dsputil.h" | 24 | #include "libavcodec/dsputil.h" |
| 24 | #include "libavcodec/mlp.h" | 25 | #include "libavcodec/mlp.h" |
| @@ -22,6 +22,8 @@ · 21 unmodified lines | |||
| 22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include "libavutil/internal.h" | ||
| 26 | #include "libavutil/mem.h" | ||
| 25 | #include "libavutil/x86/asm.h" | 27 | #include "libavutil/x86/asm.h" |
| 26 | #include "libavcodec/dsputil.h" | 28 | #include "libavcodec/dsputil.h" |
| 27 | #include "dsputil_mmx.h" | 29 | #include "dsputil_mmx.h" |
File renamed without changes.
| @@ -3,20 +3,20 @@ · 2 unmodified lines | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2010-2011 Maxim Poliakovski | 4 | * Copyright (c) 2010-2011 Maxim Poliakovski |
| 5 | * | 5 | * |
| 6 | * This file is part of Libav. | 6 | * This file is part of FFmpeg. |
| 7 | * | 7 | * |
| 8 | * Libav is free software; you can redistribute it and/or | 8 | * FFmpeg is free software; you can redistribute it and/or |
| 9 | * modify it under the terms of the GNU Lesser General Public | 9 | * modify it under the terms of the GNU Lesser General Public |
| 10 | * License as published by the Free Software Foundation; either | 10 | * License as published by the Free Software Foundation; either |
| 11 | * version 2.1 of the License, or (at your option) any later version. | 11 | * version 2.1 of the License, or (at your option) any later version. |
| 12 | * | 12 | * |
| 13 | * Libav is distributed in the hope that it will be useful, | 13 | * FFmpeg is distributed in the hope that it will be useful, |
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 16 | * Lesser General Public License for more details. | 16 | * Lesser General Public License for more details. |
| 17 | * | 17 | * |
| 18 | * You should have received a copy of the GNU Lesser General Public | 18 | * You should have received a copy of the GNU Lesser General Public |
| 19 | * License along with Libav; if not, write to the Free Software | 19 | * License along with FFmpeg; if not, write to the Free Software |
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include "libavcodec/rv34dsp.h" | 29 | #include "libavcodec/rv34dsp.h" |
| 30 | #include "libavutil/mem.h" | ||
| 30 | #include "dsputil_mmx.h" | 31 | #include "dsputil_mmx.h" |
| 31 | 32 | ||
| 32 | void ff_put_rv40_chroma_mc8_mmx (uint8_t *dst, uint8_t *src, | 33 | void ff_put_rv40_chroma_mc8_mmx (uint8_t *dst, uint8_t *src, |
| @@ -21,6 +21,8 @@ · 20 unmodified lines | |||
| 21 | */ | 21 | */ |
| 22 | #include "libavcodec/dsputil.h" | 22 | #include "libavcodec/dsputil.h" |
| 23 | #include "libavcodec/simple_idct.h" | 23 | #include "libavcodec/simple_idct.h" |
| 24 | #include "libavutil/internal.h" | ||
| 25 | #include "libavutil/mem.h" | ||
| 24 | #include "dsputil_mmx.h" | 26 | #include "dsputil_mmx.h" |
| 25 | 27 | ||
| 26 | #if HAVE_INLINE_ASM | 28 | #if HAVE_INLINE_ASM |
| @@ -25,6 +25,8 @@ · 24 unmodified lines | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "libavutil/cpu.h" | 27 | #include "libavutil/cpu.h" |
| 28 | #include "libavutil/internal.h" | ||
| 29 | #include "libavutil/mem.h" | ||
| 28 | #include "libavutil/x86/asm.h" | 30 | #include "libavutil/x86/asm.h" |
| 29 | #include "libavcodec/dsputil.h" | 31 | #include "libavcodec/dsputil.h" |
| 30 | #include "dsputil_mmx.h" | 32 | #include "dsputil_mmx.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include "libavutil/cpu.h" | 23 | #include "libavutil/cpu.h" |
| 24 | #include "libavutil/mem.h" | ||
| 24 | #include "libavutil/x86/asm.h" | 25 | #include "libavutil/x86/asm.h" |
| 25 | #include "libavcodec/vp8dsp.h" | 26 | #include "libavcodec/vp8dsp.h" |
| 26 | 27 | ||
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | #include "avcodec.h" | 23 | #include "avcodec.h" |
| 24 | #include "internal.h" | 24 | #include "internal.h" |
| 25 | #include "libavutil/common.h" | ||
| 25 | 26 | ||
| 26 | static av_cold int xbm_encode_init(AVCodecContext *avctx) | 27 | static av_cold int xbm_encode_init(AVCodecContext *avctx) |
| 27 | { | 28 | { |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | * Miro VideoXL codec. | 24 | * Miro VideoXL codec. |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "libavutil/common.h" | ||
| 27 | #include "libavutil/intreadwrite.h" | 28 | #include "libavutil/intreadwrite.h" |
| 28 | #include "avcodec.h" | 29 | #include "avcodec.h" |
| 29 | 30 | ||
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | #include <zlib.h> | 19 | #include <zlib.h> |
| 20 | 20 | ||
| 21 | #include "avcodec.h" | 21 | #include "avcodec.h" |
| 22 | #include "libavutil/common.h" | ||
| 22 | 23 | ||
| 23 | typedef struct { | 24 | typedef struct { |
| 24 | AVFrame previous_frame; | 25 | AVFrame previous_frame; |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include <stdio.h> | 27 | #include <stdio.h> |
| 28 | #include <stdlib.h> | 28 | #include <stdlib.h> |
| 29 | 29 | ||
| 30 | #include "libavutil/common.h" | ||
| 30 | #include "libavutil/intreadwrite.h" | 31 | #include "libavutil/intreadwrite.h" |
| 31 | #include "avcodec.h" | 32 | #include "avcodec.h" |
| 32 | 33 | ||
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include <stdio.h> | 27 | #include <stdio.h> |
| 28 | #include <stdlib.h> | 28 | #include <stdlib.h> |
| 29 | 29 | ||
| 30 | #include "libavutil/common.h" | ||
| 30 | #include "libavutil/intreadwrite.h" | 31 | #include "libavutil/intreadwrite.h" |
| 31 | #include "avcodec.h" | 32 | #include "avcodec.h" |
| 32 | #include "internal.h" | 33 | #include "internal.h" |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | 18 | ||
| 19 | #include "libavutil/avassert.h" | 19 | #include "libavutil/avassert.h" |
| 20 | #include "avdevice.h" | 20 | #include "avdevice.h" |
| 21 | #include "config.h" | ||
| 21 | 22 | ||
| 22 | unsigned avdevice_version(void) | 23 | unsigned avdevice_version(void) |
| 23 | { | 24 | { |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include "libavutil/common.h" | ||
| 25 | #include "libavutil/mem.h" | 26 | #include "libavutil/mem.h" |
| 26 | #include "config.h" | 27 | #include "config.h" |
| 27 | #include "timefilter.h" | 28 | #include "timefilter.h" |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | #include "libavutil/audioconvert.h" | 26 | #include "libavutil/audioconvert.h" |
| 27 | #include "libavutil/avstring.h" | 27 | #include "libavutil/avstring.h" |
| 28 | #include "libavutil/common.h" | ||
| 28 | #include "libavutil/opt.h" | 29 | #include "libavutil/opt.h" |
| 29 | 30 | ||
| 30 | #include "audio.h" | 31 | #include "audio.h" |
| @@ -32,6 +32,7 @@ · 31 unmodified lines | |||
| 32 | #include "libavutil/audio_fifo.h" | 32 | #include "libavutil/audio_fifo.h" |
| 33 | #include "libavutil/avassert.h" | 33 | #include "libavutil/avassert.h" |
| 34 | #include "libavutil/avstring.h" | 34 | #include "libavutil/avstring.h" |
| 35 | #include "libavutil/common.h" | ||
| 35 | #include "libavutil/float_dsp.h" | 36 | #include "libavutil/float_dsp.h" |
| 36 | #include "libavutil/mathematics.h" | 37 | #include "libavutil/mathematics.h" |
| 37 | #include "libavutil/opt.h" | 38 | #include "libavutil/opt.h" |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | #include "audio.h" | 25 | #include "audio.h" |
| 26 | #include "avfilter.h" | 26 | #include "avfilter.h" |
| 27 | #include "internal.h" | 27 | #include "internal.h" |
| 28 | #include "libavutil/internal.h" | ||
| 28 | 29 | ||
| 29 | AVFilter avfilter_af_anull = { | 30 | AVFilter avfilter_af_anull = { |
| 30 | .name = "anull", | 31 | .name = "anull", |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | 18 | ||
| 19 | #include "libavresample/avresample.h" | 19 | #include "libavresample/avresample.h" |
| 20 | #include "libavutil/audio_fifo.h" | 20 | #include "libavutil/audio_fifo.h" |
| 21 | #include "libavutil/common.h" | ||
| 21 | #include "libavutil/mathematics.h" | 22 | #include "libavutil/mathematics.h" |
| 22 | #include "libavutil/opt.h" | 23 | #include "libavutil/opt.h" |
| 23 | #include "libavutil/samplefmt.h" | 24 | #include "libavutil/samplefmt.h" |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | 27 | ||
| 28 | #include "libavutil/audioconvert.h" | 28 | #include "libavutil/audioconvert.h" |
| 29 | #include "libavutil/avstring.h" | 29 | #include "libavutil/avstring.h" |
| 30 | #include "libavutil/common.h" | ||
| 30 | #include "libavutil/mathematics.h" | 31 | #include "libavutil/mathematics.h" |
| 31 | #include "libavutil/opt.h" | 32 | #include "libavutil/opt.h" |
| 32 | #include "libavutil/samplefmt.h" | 33 | #include "libavutil/samplefmt.h" |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include "libavutil/audioconvert.h" | 26 | #include "libavutil/audioconvert.h" |
| 27 | #include "libavutil/internal.h" | ||
| 27 | #include "libavutil/opt.h" | 28 | #include "libavutil/opt.h" |
| 28 | 29 | ||
| 29 | #include "audio.h" | 30 | #include "audio.h" |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | 27 | ||
| 28 | #include "libavutil/audioconvert.h" | 28 | #include "libavutil/audioconvert.h" |
| 29 | #include "libavutil/avassert.h" | 29 | #include "libavutil/avassert.h" |
| 30 | #include "libavutil/common.h" | ||
| 30 | #include "libavutil/opt.h" | 31 | #include "libavutil/opt.h" |
| 31 | 32 | ||
| 32 | #include "audio.h" | 33 | #include "audio.h" |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | #include "libavutil/avassert.h" | 25 | #include "libavutil/avassert.h" |
| 26 | #include "libavutil/avstring.h" | 26 | #include "libavutil/avstring.h" |
| 27 | #include "libavutil/common.h" | ||
| 27 | #include "libavutil/mathematics.h" | 28 | #include "libavutil/mathematics.h" |
| 28 | #include "libavutil/opt.h" | 29 | #include "libavutil/opt.h" |
| 29 | 30 | ||
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "avfilter.h" | 22 | #include "avfilter.h" |
| 23 | #include "config.h" | ||
| 23 | 24 | ||
| 24 | 25 | ||
| 25 | #define REGISTER_FILTER(X,x,y) { \ | 26 | #define REGISTER_FILTER(X,x,y) { \ |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/internal.h" | ||
| 21 | #include "avfilter.h" | 22 | #include "avfilter.h" |
| 22 | #include "internal.h" | 23 | #include "internal.h" |
| 23 | 24 | ||
| @@ -24,14 +24,17 @@ · 23 unmodified lines | |||
| 24 | * null audio source | 24 | * null audio source |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "internal.h" | 27 | #include <inttypes.h> |
| 28 | #include "libavutil/audioconvert.h" | 28 | #include <stdio.h> |
| 29 | #include "libavutil/opt.h" | ||
| 30 | 29 | ||
| 31 | #include "audio.h" | 30 | #include "audio.h" |
| 32 | #include "avfilter.h" | 31 | #include "avfilter.h" |
| 33 | #include "internal.h" | 32 | #include "internal.h" |
| 34 | 33 | ||
| 34 | #include "libavutil/audioconvert.h" | ||
| 35 | #include "libavutil/internal.h" | ||
| 36 | #include "libavutil/opt.h" | ||
| 37 | |||
| 35 | typedef struct { | 38 | typedef struct { |
| 36 | const AVClass *class; | 39 | const AVClass *class; |
| 37 | char *channel_layout_str; | 40 | char *channel_layout_str; |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include "libavutil/avassert.h" | 22 | #include "libavutil/avassert.h" |
| 23 | #include "libavutil/audioconvert.h" | 23 | #include "libavutil/audioconvert.h" |
| 24 | #include "libavutil/common.h" | ||
| 24 | 25 | ||
| 25 | #include "audio.h" | 26 | #include "audio.h" |
| 26 | #include "avfilter.h" | 27 | #include "avfilter.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/common.h" | ||
| 22 | #include "libavutil/pixdesc.h" | 23 | #include "libavutil/pixdesc.h" |
| 23 | #include "libavutil/rational.h" | 24 | #include "libavutil/rational.h" |
| 24 | #include "libavutil/audioconvert.h" | 25 | #include "libavutil/audioconvert.h" |
| @@ -34,6 +34,7 @@ · 33 unmodified lines | |||
| 34 | 34 | ||
| 35 | #include "libavutil/audioconvert.h" | 35 | #include "libavutil/audioconvert.h" |
| 36 | #include "libavutil/avassert.h" | 36 | #include "libavutil/avassert.h" |
| 37 | #include "libavutil/common.h" | ||
| 37 | #include "libavutil/log.h" | 38 | #include "libavutil/log.h" |
| 38 | 39 | ||
| 39 | static const AVClass filtergraph_class = { | 40 | static const AVClass filtergraph_class = { |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | #include "libavutil/audioconvert.h" | 23 | #include "libavutil/audioconvert.h" |
| 24 | #include "libavutil/avassert.h" | 24 | #include "libavutil/avassert.h" |
| 25 | #include "libavutil/common.h" | ||
| 25 | #include "libavutil/imgutils.h" | 26 | #include "libavutil/imgutils.h" |
| 26 | #include "libavcodec/avcodec.h" | 27 | #include "libavcodec/avcodec.h" |
| 27 | 28 | ||
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | #include "libavutil/audio_fifo.h" | 26 | #include "libavutil/audio_fifo.h" |
| 27 | #include "libavutil/audioconvert.h" | 27 | #include "libavutil/audioconvert.h" |
| 28 | #include "libavutil/avassert.h" | 28 | #include "libavutil/avassert.h" |
| 29 | #include "libavutil/common.h" | ||
| 29 | #include "libavutil/mathematics.h" | 30 | #include "libavutil/mathematics.h" |
| 30 | 31 | ||
| 31 | #include "audio.h" | 32 | #include "audio.h" |
| @@ -32,6 +32,7 @@ · 31 unmodified lines | |||
| 32 | #include "avcodec.h" | 32 | #include "avcodec.h" |
| 33 | 33 | ||
| 34 | #include "libavutil/audioconvert.h" | 34 | #include "libavutil/audioconvert.h" |
| 35 | #include "libavutil/common.h" | ||
| 35 | #include "libavutil/fifo.h" | 36 | #include "libavutil/fifo.h" |
| 36 | #include "libavutil/imgutils.h" | 37 | #include "libavutil/imgutils.h" |
| 37 | #include "libavutil/opt.h" | 38 | #include "libavutil/opt.h" |
| @@ -19,8 +19,11 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <string.h> | ||
| 23 | |||
| 22 | #include "libavutil/avutil.h" | 24 | #include "libavutil/avutil.h" |
| 23 | #include "libavutil/colorspace.h" | 25 | #include "libavutil/colorspace.h" |
| 26 | #include "libavutil/mem.h" | ||
| 24 | #include "libavutil/pixdesc.h" | 27 | #include "libavutil/pixdesc.h" |
| 25 | #include "drawutils.h" | 28 | #include "drawutils.h" |
| 26 | #include "formats.h" | 29 | #include "formats.h" |
| @@ -23,8 +23,12 @@ · 22 unmodified lines | |||
| 23 | * Set timebase for the output link. | 23 | * Set timebase for the output link. |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <inttypes.h> | ||
| 27 | #include <stdio.h> | ||
| 28 | |||
| 26 | #include "libavutil/avstring.h" | 29 | #include "libavutil/avstring.h" |
| 27 | #include "libavutil/eval.h" | 30 | #include "libavutil/eval.h" |
| 31 | #include "libavutil/internal.h" | ||
| 28 | #include "libavutil/mathematics.h" | 32 | #include "libavutil/mathematics.h" |
| 29 | #include "libavutil/rational.h" | 33 | #include "libavutil/rational.h" |
| 30 | #include "avfilter.h" | 34 | #include "avfilter.h" |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | #include "libavutil/avassert.h" | 26 | #include "libavutil/avassert.h" |
| 27 | #include "libavutil/audioconvert.h" | 27 | #include "libavutil/audioconvert.h" |
| 28 | #include "libavutil/common.h" | ||
| 28 | #include "libavutil/mathematics.h" | 29 | #include "libavutil/mathematics.h" |
| 29 | #include "libavutil/samplefmt.h" | 30 | #include "libavutil/samplefmt.h" |
| 30 | 31 | ||
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/common.h" | ||
| 22 | #include "libavutil/eval.h" | 23 | #include "libavutil/eval.h" |
| 23 | #include "libavutil/pixdesc.h" | 24 | #include "libavutil/pixdesc.h" |
| 24 | #include "libavutil/parseutils.h" | 25 | #include "libavutil/parseutils.h" |
| @@ -22,8 +22,10 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | #include <ctype.h> | 23 | #include <ctype.h> |
| 24 | #include <string.h> | 24 | #include <string.h> |
| 25 | #include <stdio.h> | ||
| 25 | 26 | ||
| 26 | #include "libavutil/avstring.h" | 27 | #include "libavutil/avstring.h" |
| 28 | #include "libavutil/mem.h" | ||
| 27 | #include "avfilter.h" | 29 | #include "avfilter.h" |
| 28 | #include "avfiltergraph.h" | 30 | #include "avfiltergraph.h" |
| 29 | 31 | ||
| @@ -23,6 +23,10 @@ · 22 unmodified lines | |||
| 23 | * audio and video splitter | 23 | * audio and video splitter |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <stdio.h> | ||
| 27 | |||
| 28 | #include "libavutil/internal.h" | ||
| 29 | #include "libavutil/mem.h" | ||
| 26 | #include "avfilter.h" | 30 | #include "avfilter.h" |
| 27 | #include "audio.h" | 31 | #include "audio.h" |
| 28 | #include "internal.h" | 32 | #include "internal.h" |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | * aspect ratio modification video filters | 23 | * aspect ratio modification video filters |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include "libavutil/common.h" | ||
| 26 | #include "libavutil/mathematics.h" | 27 | #include "libavutil/mathematics.h" |
| 27 | #include "libavutil/parseutils.h" | 28 | #include "libavutil/parseutils.h" |
| 28 | #include "avfilter.h" | 29 | #include "avfilter.h" |
| @@ -27,6 +27,10 @@ · 26 unmodified lines | |||
| 27 | * Ported from MPlayer libmpcodecs/vf_blackframe.c. | 27 | * Ported from MPlayer libmpcodecs/vf_blackframe.c. |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <stdio.h> | ||
| 31 | #include <inttypes.h> | ||
| 32 | |||
| 33 | #include "libavutil/internal.h" | ||
| 30 | #include "avfilter.h" | 34 | #include "avfilter.h" |
| 31 | #include "internal.h" | 35 | #include "internal.h" |
| 32 | #include "formats.h" | 36 | #include "formats.h" |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include "libavutil/avstring.h" | 28 | #include "libavutil/avstring.h" |
| 29 | #include "libavutil/common.h" | ||
| 29 | #include "libavutil/eval.h" | 30 | #include "libavutil/eval.h" |
| 30 | #include "libavutil/pixdesc.h" | 31 | #include "libavutil/pixdesc.h" |
| 31 | #include "avfilter.h" | 32 | #include "avfilter.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | * copy video filter | 21 | * copy video filter |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include "libavutil/internal.h" | ||
| 24 | #include "avfilter.h" | 25 | #include "avfilter.h" |
| 25 | #include "internal.h" | 26 | #include "internal.h" |
| 26 | #include "video.h" | 27 | #include "video.h" |
| @@ -25,12 +25,15 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | /* #define DEBUG */ | 26 | /* #define DEBUG */ |
| 27 | 27 | ||
| 28 | #include <stdio.h> | ||
| 29 | |||
| 28 | #include "avfilter.h" | 30 | #include "avfilter.h" |
| 29 | #include "formats.h" | 31 | #include "formats.h" |
| 30 | #include "internal.h" | 32 | #include "internal.h" |
| 31 | #include "video.h" | 33 | #include "video.h" |
| 32 | #include "libavutil/eval.h" | 34 | #include "libavutil/eval.h" |
| 33 | #include "libavutil/avstring.h" | 35 | #include "libavutil/avstring.h" |
| 36 | #include "libavutil/internal.h" | ||
| 34 | #include "libavutil/libm.h" | 37 | #include "libavutil/libm.h" |
| 35 | #include "libavutil/imgutils.h" | 38 | #include "libavutil/imgutils.h" |
| 36 | #include "libavutil/mathematics.h" | 39 | #include "libavutil/mathematics.h" |
| @@ -23,7 +23,10 @@ · 22 unmodified lines | |||
| 23 | * Ported from MPlayer libmpcodecs/vf_cropdetect.c. | 23 | * Ported from MPlayer libmpcodecs/vf_cropdetect.c. |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <stdio.h> | ||
| 27 | |||
| 26 | #include "libavutil/imgutils.h" | 28 | #include "libavutil/imgutils.h" |
| 29 | #include "libavutil/internal.h" | ||
| 27 | #include "avfilter.h" | 30 | #include "avfilter.h" |
| 28 | #include "formats.h" | 31 | #include "formats.h" |
| 29 | #include "internal.h" | 32 | #include "internal.h" |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | * Ported from MPlayer libmpcodecs/vf_delogo.c. | 25 | * Ported from MPlayer libmpcodecs/vf_delogo.c. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include "libavutil/common.h" | ||
| 28 | #include "libavutil/imgutils.h" | 29 | #include "libavutil/imgutils.h" |
| 29 | #include "libavutil/opt.h" | 30 | #include "libavutil/opt.h" |
| 30 | #include "libavutil/pixdesc.h" | 31 | #include "libavutil/pixdesc.h" |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "libavutil/colorspace.h" | 27 | #include "libavutil/colorspace.h" |
| 28 | #include "libavutil/common.h" | ||
| 28 | #include "libavutil/pixdesc.h" | 29 | #include "libavutil/pixdesc.h" |
| 29 | #include "libavutil/parseutils.h" | 30 | #include "libavutil/parseutils.h" |
| 30 | #include "avfilter.h" | 31 | #include "avfilter.h" |
| @@ -31,6 +31,7 @@ · 30 unmodified lines | |||
| 31 | 31 | ||
| 32 | #include "config.h" | 32 | #include "config.h" |
| 33 | #include "libavutil/avstring.h" | 33 | #include "libavutil/avstring.h" |
| 34 | #include "libavutil/common.h" | ||
| 34 | #include "libavutil/file.h" | 35 | #include "libavutil/file.h" |
| 35 | #include "libavutil/eval.h" | 36 | #include "libavutil/eval.h" |
| 36 | #include "libavutil/opt.h" | 37 | #include "libavutil/opt.h" |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include "libavutil/avstring.h" | 28 | #include "libavutil/avstring.h" |
| 29 | #include "libavutil/common.h" | ||
| 29 | #include "libavutil/eval.h" | 30 | #include "libavutil/eval.h" |
| 30 | #include "libavutil/opt.h" | 31 | #include "libavutil/opt.h" |
| 31 | #include "libavutil/pixdesc.h" | 32 | #include "libavutil/pixdesc.h" |
| @@ -25,7 +25,11 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | /* #define DEBUG */ | 26 | /* #define DEBUG */ |
| 27 | 27 | ||
| 28 | #include <stdio.h> | ||
| 29 | #include <string.h> | ||
| 30 | |||
| 28 | #include "libavutil/imgutils.h" | 31 | #include "libavutil/imgutils.h" |
| 32 | #include "libavutil/internal.h" | ||
| 29 | #include "libavutil/pixdesc.h" | 33 | #include "libavutil/pixdesc.h" |
| 30 | #include "avfilter.h" | 34 | #include "avfilter.h" |
| 31 | #include "formats.h" | 35 | #include "formats.h" |
| @@ -23,6 +23,10 @@ · 22 unmodified lines | |||
| 23 | * format and noformat video filters | 23 | * format and noformat video filters |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <string.h> | ||
| 27 | |||
| 28 | #include "libavutil/internal.h" | ||
| 29 | #include "libavutil/mem.h" | ||
| 26 | #include "libavutil/pixdesc.h" | 30 | #include "libavutil/pixdesc.h" |
| 27 | #include "avfilter.h" | 31 | #include "avfilter.h" |
| 28 | #include "internal.h" | 32 | #include "internal.h" |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | * a filter enforcing given constant framerate | 25 | * a filter enforcing given constant framerate |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include "libavutil/common.h" | ||
| 28 | #include "libavutil/fifo.h" | 29 | #include "libavutil/fifo.h" |
| 29 | #include "libavutil/mathematics.h" | 30 | #include "libavutil/mathematics.h" |
| 30 | #include "libavutil/opt.h" | 31 | #include "libavutil/opt.h" |
| @@ -33,6 +33,7 @@ · 32 unmodified lines | |||
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include "libavutil/imgutils.h" | 35 | #include "libavutil/imgutils.h" |
| 36 | #include "libavutil/common.h" | ||
| 36 | #include "libavutil/cpu.h" | 37 | #include "libavutil/cpu.h" |
| 37 | #include "libavutil/pixdesc.h" | 38 | #include "libavutil/pixdesc.h" |
| 38 | #include "avfilter.h" | 39 | #include "avfilter.h" |
| @@ -24,11 +24,14 @@ · 23 unmodified lines | |||
| 24 | * horizontal flip filter | 24 | * horizontal flip filter |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <string.h> | ||
| 28 | |||
| 27 | #include "avfilter.h" | 29 | #include "avfilter.h" |
| 28 | #include "formats.h" | 30 | #include "formats.h" |
| 29 | #include "internal.h" | 31 | #include "internal.h" |
| 30 | #include "video.h" | 32 | #include "video.h" |
| 31 | #include "libavutil/pixdesc.h" | 33 | #include "libavutil/pixdesc.h" |
| 34 | #include "libavutil/internal.h" | ||
| 32 | #include "libavutil/intreadwrite.h" | 35 | #include "libavutil/intreadwrite.h" |
| 33 | #include "libavutil/imgutils.h" | 36 | #include "libavutil/imgutils.h" |
| 34 | 37 | ||
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | * libmpcodecs/vf_hqdn3d.c. | 26 | * libmpcodecs/vf_hqdn3d.c. |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include "libavutil/common.h" | ||
| 29 | #include "libavutil/pixdesc.h" | 30 | #include "libavutil/pixdesc.h" |
| 30 | #include "libavutil/intreadwrite.h" | 31 | #include "libavutil/intreadwrite.h" |
| 31 | #include "avfilter.h" | 32 | #include "avfilter.h" |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | * value, and apply it to input video. | 24 | * value, and apply it to input video. |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "libavutil/common.h" | ||
| 27 | #include "libavutil/eval.h" | 28 | #include "libavutil/eval.h" |
| 28 | #include "libavutil/opt.h" | 29 | #include "libavutil/opt.h" |
| 29 | #include "libavutil/pixdesc.h" | 30 | #include "libavutil/pixdesc.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | * null video filter | 21 | * null video filter |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include "libavutil/internal.h" | ||
| 24 | #include "avfilter.h" | 25 | #include "avfilter.h" |
| 25 | #include "internal.h" | 26 | #include "internal.h" |
| 26 | #include "video.h" | 27 | #include "video.h" |
| @@ -29,6 +29,7 @@ · 28 unmodified lines | |||
| 29 | 29 | ||
| 30 | #include "avfilter.h" | 30 | #include "avfilter.h" |
| 31 | #include "formats.h" | 31 | #include "formats.h" |
| 32 | #include "libavutil/common.h" | ||
| 32 | #include "libavutil/eval.h" | 33 | #include "libavutil/eval.h" |
| 33 | #include "libavutil/avstring.h" | 34 | #include "libavutil/avstring.h" |
| 34 | #include "libavutil/opt.h" | 35 | #include "libavutil/opt.h" |
| @@ -29,6 +29,7 @@ · 28 unmodified lines | |||
| 29 | #include "internal.h" | 29 | #include "internal.h" |
| 30 | #include "video.h" | 30 | #include "video.h" |
| 31 | #include "libavutil/avstring.h" | 31 | #include "libavutil/avstring.h" |
| 32 | #include "libavutil/common.h" | ||
| 32 | #include "libavutil/eval.h" | 33 | #include "libavutil/eval.h" |
| 33 | #include "libavutil/pixdesc.h" | 34 | #include "libavutil/pixdesc.h" |
| 34 | #include "libavutil/colorspace.h" | 35 | #include "libavutil/colorspace.h" |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | * pixdesc test filter | 23 | * pixdesc test filter |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include "libavutil/common.h" | ||
| 26 | #include "libavutil/pixdesc.h" | 27 | #include "libavutil/pixdesc.h" |
| 27 | #include "avfilter.h" | 28 | #include "avfilter.h" |
| 28 | #include "internal.h" | 29 | #include "internal.h" |
| @@ -23,12 +23,16 @@ · 22 unmodified lines | |||
| 23 | * scale video filter | 23 | * scale video filter |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <stdio.h> | ||
| 27 | #include <string.h> | ||
| 28 | |||
| 26 | #include "avfilter.h" | 29 | #include "avfilter.h" |
| 27 | #include "formats.h" | 30 | #include "formats.h" |
| 28 | #include "internal.h" | 31 | #include "internal.h" |
| 29 | #include "video.h" | 32 | #include "video.h" |
| 30 | #include "libavutil/avstring.h" | 33 | #include "libavutil/avstring.h" |
| 31 | #include "libavutil/eval.h" | 34 | #include "libavutil/eval.h" |
| 35 | #include "libavutil/internal.h" | ||
| 32 | #include "libavutil/mathematics.h" | 36 | #include "libavutil/mathematics.h" |
| 33 | #include "libavutil/opt.h" | 37 | #include "libavutil/opt.h" |
| 34 | #include "libavutil/pixdesc.h" | 38 | #include "libavutil/pixdesc.h" |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | #include "libavutil/eval.h" | 26 | #include "libavutil/eval.h" |
| 27 | #include "libavutil/fifo.h" | 27 | #include "libavutil/fifo.h" |
| 28 | #include "libavcodec/dsputil.h" | 28 | #include "libavcodec/dsputil.h" |
| 29 | #include "libavutil/internal.h" | ||
| 29 | #include "avfilter.h" | 30 | #include "avfilter.h" |
| 30 | #include "formats.h" | 31 | #include "formats.h" |
| 31 | #include "internal.h" | 32 | #include "internal.h" |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | /* #define DEBUG */ | 27 | /* #define DEBUG */ |
| 28 | 28 | ||
| 29 | #include "libavutil/eval.h" | 29 | #include "libavutil/eval.h" |
| 30 | #include "libavutil/internal.h" | ||
| 30 | #include "libavutil/mathematics.h" | 31 | #include "libavutil/mathematics.h" |
| 31 | #include "avfilter.h" | 32 | #include "avfilter.h" |
| 32 | #include "internal.h" | 33 | #include "internal.h" |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | #include "libavutil/adler32.h" | 25 | #include "libavutil/adler32.h" |
| 26 | #include "libavutil/imgutils.h" | 26 | #include "libavutil/imgutils.h" |
| 27 | #include "libavutil/internal.h" | ||
| 27 | #include "libavutil/pixdesc.h" | 28 | #include "libavutil/pixdesc.h" |
| 28 | #include "libavutil/timestamp.h" | 29 | #include "libavutil/timestamp.h" |
| 29 | #include "avfilter.h" | 30 | #include "avfilter.h" |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | #include "avfilter.h" | 26 | #include "avfilter.h" |
| 27 | #include "internal.h" | 27 | #include "internal.h" |
| 28 | #include "video.h" | 28 | #include "video.h" |
| 29 | #include "libavutil/common.h" | ||
| 29 | #include "libavutil/pixdesc.h" | 30 | #include "libavutil/pixdesc.h" |
| 30 | 31 | ||
| 31 | typedef struct { | 32 | typedef struct { |
| @@ -25,9 +25,12 @@ · 24 unmodified lines | |||
| 25 | * Based on MPlayer libmpcodecs/vf_rotate.c. | 25 | * Based on MPlayer libmpcodecs/vf_rotate.c. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <stdio.h> | ||
| 29 | |||
| 28 | #include "libavutil/intreadwrite.h" | 30 | #include "libavutil/intreadwrite.h" |
| 29 | #include "libavutil/pixdesc.h" | 31 | #include "libavutil/pixdesc.h" |
| 30 | #include "libavutil/imgutils.h" | 32 | #include "libavutil/imgutils.h" |
| 33 | #include "libavutil/internal.h" | ||
| 31 | #include "avfilter.h" | 34 | #include "avfilter.h" |
| 32 | #include "formats.h" | 35 | #include "formats.h" |
| 33 | #include "internal.h" | 36 | #include "internal.h" |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | * video vertical flip filter | 23 | * video vertical flip filter |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include "libavutil/internal.h" | ||
| 26 | #include "libavutil/pixdesc.h" | 27 | #include "libavutil/pixdesc.h" |
| 27 | #include "avfilter.h" | 28 | #include "avfilter.h" |
| 28 | #include "internal.h" | 29 | #include "internal.h" |
| @@ -20,8 +20,12 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <string.h> | ||
| 24 | #include <stdio.h> | ||
| 25 | |||
| 23 | #include "libavutil/avassert.h" | 26 | #include "libavutil/avassert.h" |
| 24 | #include "libavutil/imgutils.h" | 27 | #include "libavutil/imgutils.h" |
| 28 | #include "libavutil/mem.h" | ||
| 25 | 29 | ||
| 26 | #include "avfilter.h" | 30 | #include "avfilter.h" |
| 27 | #include "internal.h" | 31 | #include "internal.h" |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | 18 | ||
| 19 | #include "avfilter.h" | 19 | #include "avfilter.h" |
| 20 | #include "internal.h" | 20 | #include "internal.h" |
| 21 | #include "libavutil/internal.h" | ||
| 21 | 22 | ||
| 22 | static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref) | 23 | static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref) |
| 23 | { | 24 | { |
| @@ -35,6 +35,7 @@ · 34 unmodified lines | |||
| 35 | 35 | ||
| 36 | #include <float.h> | 36 | #include <float.h> |
| 37 | 37 | ||
| 38 | #include "libavutil/common.h" | ||
| 38 | #include "libavutil/opt.h" | 39 | #include "libavutil/opt.h" |
| 39 | #include "libavutil/imgutils.h" | 40 | #include "libavutil/imgutils.h" |
| 40 | #include "libavutil/intreadwrite.h" | 41 | #include "libavutil/intreadwrite.h" |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #include "libavutil/attributes.h" | 21 | #include "libavutil/attributes.h" |
| 22 | #include "libavutil/cpu.h" | 22 | #include "libavutil/cpu.h" |
| 23 | #include "libavutil/mem.h" | ||
| 23 | #include "libavutil/x86/asm.h" | 24 | #include "libavutil/x86/asm.h" |
| 24 | #include "libavfilter/gradfun.h" | 25 | #include "libavfilter/gradfun.h" |
| 25 | 26 | ||
| @@ -20,6 +20,8 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #include "libavutil/attributes.h" | 21 | #include "libavutil/attributes.h" |
| 22 | #include "libavutil/cpu.h" | 22 | #include "libavutil/cpu.h" |
| 23 | #include "libavutil/internal.h" | ||
| 24 | #include "libavutil/mem.h" | ||
| 23 | #include "libavutil/x86/asm.h" | 25 | #include "libavutil/x86/asm.h" |
| 24 | #include "libavcodec/x86/dsputil_mmx.h" | 26 | #include "libavcodec/x86/dsputil_mmx.h" |
| 25 | #include "libavfilter/yadif.h" | 27 | #include "libavfilter/yadif.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | #include "libavutil/avutil.h" | 21 | #include "libavutil/avutil.h" |
| 22 | #include "network.h" | 22 | #include "network.h" |
| 23 | #include "libavcodec/internal.h" | 23 | #include "libavcodec/internal.h" |
| 24 | #include "libavutil/mem.h" | ||
| 24 | 25 | ||
| 25 | #define THREADS (HAVE_PTHREADS || (defined(WIN32) && !defined(__MINGW32CE__))) | 26 | #define THREADS (HAVE_PTHREADS || (defined(WIN32) && !defined(__MINGW32CE__))) |
| 26 | 27 | ||
| @@ -41,6 +41,10 @@ · 40 unmodified lines | |||
| 41 | #include "rtmppkt.h" | 41 | #include "rtmppkt.h" |
| 42 | #include "url.h" | 42 | #include "url.h" |
| 43 | 43 | ||
| 44 | #if CONFIG_ZLIB | ||
| 45 | #include <zlib.h> | ||
| 46 | #endif | ||
| 47 | |||
| 44 | //#define DEBUG | 48 | //#define DEBUG |
| 45 | 49 | ||
| 46 | #define APP_MAX_LENGTH 128 | 50 | #define APP_MAX_LENGTH 128 |
| @@ -95,6 +99,7 @@ typedef struct RTMPContext { · 48 unmodified lines | |||
| 95 | int swfhash_len; ///< length of the SHA256 hash | 99 | int swfhash_len; ///< length of the SHA256 hash |
| 96 | int swfsize; ///< size of the decompressed SWF file | 100 | int swfsize; ///< size of the decompressed SWF file |
| 97 | char* swfurl; ///< url of the swf player | 101 | char* swfurl; ///< url of the swf player |
| 102 | char* swfverify; ///< URL to player swf file, compute hash/size automatically | ||
| 98 | char swfverification[42]; ///< hash of the SWF verification | 103 | char swfverification[42]; ///< hash of the SWF verification |
| 99 | char* pageurl; ///< url of the web page | 104 | char* pageurl; ///< url of the web page |
| 100 | char* subscribe; ///< name of live stream to subscribe | 105 | char* subscribe; ///< name of live stream to subscribe |
| @@ -825,6 +830,129 @@ static int rtmp_calc_swf_verification(URLContext *s, RTMPContext *rt, · 724 unmodified lines | |||
| 825 | return 0; | 830 | return 0; |
| 826 | } | 831 | } |
| 827 | 832 | ||
| 833 | #if CONFIG_ZLIB | ||
| 834 | static int rtmp_uncompress_swfplayer(uint8_t *in_data, int64_t in_size, | ||
| 835 | uint8_t **out_data, int64_t *out_size) | ||
| 836 | { | ||
| 837 | z_stream zs = { 0 }; | ||
| 838 | void *ptr; | ||
| 839 | int size; | ||
| 840 | int ret = 0; | ||
| 841 | |||
| 842 | zs.avail_in = in_size; | ||
| 843 | zs.next_in = in_data; | ||
| 844 | ret = inflateInit(&zs); | ||
| 845 | if (ret != Z_OK) | ||
| 846 | return AVERROR_UNKNOWN; | ||
| 847 | |||
| 848 | do { | ||
| 849 | uint8_t tmp_buf[16384]; | ||
| 850 | |||
| 851 | zs.avail_out = sizeof(tmp_buf); | ||
| 852 | zs.next_out = tmp_buf; | ||
| 853 | |||
| 854 | ret = inflate(&zs, Z_NO_FLUSH); | ||
| 855 | if (ret != Z_OK && ret != Z_STREAM_END) { | ||
| 856 | ret = AVERROR_UNKNOWN; | ||
| 857 | goto fail; | ||
| 858 | } | ||
| 859 | |||
| 860 | size = sizeof(tmp_buf) - zs.avail_out; | ||
| 861 | if (!(ptr = av_realloc(*out_data, *out_size + size))) { | ||
| 862 | ret = AVERROR(ENOMEM); | ||
| 863 | goto fail; | ||
| 864 | } | ||
| 865 | *out_data = ptr; | ||
| 866 | |||
| 867 | memcpy(*out_data + *out_size, tmp_buf, size); | ||
| 868 | *out_size += size; | ||
| 869 | } while (zs.avail_out == 0); | ||
| 870 | |||
| 871 | fail: | ||
| 872 | inflateEnd(&zs); | ||
| 873 | return ret; | ||
| 874 | } | ||
| 875 | #endif | ||
| 876 | |||
| 877 | static int rtmp_calc_swfhash(URLContext *s) | ||
| 878 | { | ||
| 879 | RTMPContext *rt = s->priv_data; | ||
| 880 | uint8_t *in_data = NULL, *out_data = NULL, *swfdata; | ||
| 881 | int64_t in_size, out_size; | ||
| 882 | URLContext *stream; | ||
| 883 | char swfhash[32]; | ||
| 884 | int swfsize; | ||
| 885 | int ret = 0; | ||
| 886 | |||
| 887 | /* Get the SWF player file. */ | ||
| 888 | if ((ret = ffurl_open(&stream, rt->swfverify, AVIO_FLAG_READ, | ||
| 889 | &s->interrupt_callback, NULL)) < 0) { | ||
| 890 | av_log(s, AV_LOG_ERROR, "Cannot open connection %s.\n", rt->swfverify); | ||
| 891 | goto fail; | ||
| 892 | } | ||
| 893 | |||
| 894 | if ((in_size = ffurl_seek(stream, 0, AVSEEK_SIZE)) < 0) { | ||
| 895 | ret = AVERROR(EIO); | ||
| 896 | goto fail; | ||
| 897 | } | ||
| 898 | |||
| 899 | if (!(in_data = av_malloc(in_size))) { | ||
| 900 | ret = AVERROR(ENOMEM); | ||
| 901 | goto fail; | ||
| 902 | } | ||
| 903 | |||
| 904 | if ((ret = ffurl_read_complete(stream, in_data, in_size)) < 0) | ||
| 905 | goto fail; | ||
| 906 | |||
| 907 | if (in_size < 3) { | ||
| 908 | ret = AVERROR_INVALIDDATA; | ||
| 909 | goto fail; | ||
| 910 | } | ||
| 911 | |||
| 912 | if (!memcmp(in_data, "CWS", 3)) { | ||
| 913 | /* Decompress the SWF player file using Zlib. */ | ||
| 914 | if (!(out_data = av_malloc(8))) { | ||
| 915 | ret = AVERROR(ENOMEM); | ||
| 916 | goto fail; | ||
| 917 | } | ||
| 918 | *in_data = 'F'; // magic stuff | ||
| 919 | memcpy(out_data, in_data, 8); | ||
| 920 | out_size = 8; | ||
| 921 | |||
| 922 | #if CONFIG_ZLIB | ||
| 923 | if ((ret = rtmp_uncompress_swfplayer(in_data + 8, in_size - 8, | ||
| 924 | &out_data, &out_size)) < 0) | ||
| 925 | goto fail; | ||
| 926 | #else | ||
| 927 | av_log(s, AV_LOG_ERROR, | ||
| 928 | "Zlib is required for decompressing the SWF player file.\n"); | ||
| 929 | ret = AVERROR(EINVAL); | ||
| 930 | goto fail; | ||
| 931 | #endif | ||
| 932 | swfsize = out_size; | ||
| 933 | swfdata = out_data; | ||
| 934 | } else { | ||
| 935 | swfsize = in_size; | ||
| 936 | swfdata = in_data; | ||
| 937 | } | ||
| 938 | |||
| 939 | /* Compute the SHA256 hash of the SWF player file. */ | ||
| 940 | if ((ret = ff_rtmp_calc_digest(swfdata, swfsize, 0, | ||
| 941 | "Genuine Adobe Flash Player 001", 30, | ||
| 942 | swfhash)) < 0) | ||
| 943 | goto fail; | ||
| 944 | |||
| 945 | /* Set SWFVerification parameters. */ | ||
| 946 | av_opt_set_bin(rt, "rtmp_swfhash", swfhash, 32, 0); | ||
| 947 | rt->swfsize = swfsize; | ||
| 948 | |||
| 949 | fail: | ||
| 950 | av_freep(&in_data); | ||
| 951 | av_freep(&out_data); | ||
| 952 | ffurl_close(stream); | ||
| 953 | return ret; | ||
| 954 | } | ||
| 955 | |||
| 828 | /** | 956 | /** |
| 829 | * Perform handshake with the server by means of exchanging pseudorandom data | 957 | * Perform handshake with the server by means of exchanging pseudorandom data |
| 830 | * signed with HMAC-SHA2 digest. | 958 | * signed with HMAC-SHA2 digest. |
| @@ -1492,6 +1620,11 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) · 661 unmodified lines | |||
| 1492 | goto fail; | 1620 | goto fail; |
| 1493 | } | 1621 | } |
| 1494 | 1622 | ||
| 1623 | if (rt->swfverify) { | ||
| 1624 | if ((ret = rtmp_calc_swfhash(s)) < 0) | ||
| 1625 | goto fail; | ||
| 1626 | } | ||
| 1627 | |||
| 1495 | rt->state = STATE_START; | 1628 | rt->state = STATE_START; |
| 1496 | if ((ret = rtmp_handshake(s, rt)) < 0) | 1629 | if ((ret = rtmp_handshake(s, rt)) < 0) |
| 1497 | goto fail; | 1630 | goto fail; |
| @@ -1784,6 +1917,7 @@ static const AVOption rtmp_options[] = { · 286 unmodified lines | |||
| 1784 | {"rtmp_swfhash", "SHA256 hash of the decompressed SWF file (32 bytes).", OFFSET(swfhash), AV_OPT_TYPE_BINARY, .flags = DEC}, | 1917 | {"rtmp_swfhash", "SHA256 hash of the decompressed SWF file (32 bytes).", OFFSET(swfhash), AV_OPT_TYPE_BINARY, .flags = DEC}, |
| 1785 | {"rtmp_swfsize", "Size of the decompressed SWF file, required for SWFVerification.", OFFSET(swfsize), AV_OPT_TYPE_INT, {0}, 0, INT_MAX, DEC}, | 1918 | {"rtmp_swfsize", "Size of the decompressed SWF file, required for SWFVerification.", OFFSET(swfsize), AV_OPT_TYPE_INT, {0}, 0, INT_MAX, DEC}, |
| 1786 | {"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}, | 1919 | {"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}, |
| 1920 | {"rtmp_swfverify", "URL to player swf file, compute hash/size automatically.", OFFSET(swfverify), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC}, | ||
| 1787 | {"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}, | 1921 | {"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}, |
| 1788 | { NULL }, | 1922 | { NULL }, |
| 1789 | }; | 1923 | }; |
| @@ -31,7 +31,7 @@ · 30 unmodified lines | |||
| 31 | 31 | ||
| 32 | #define LIBAVFORMAT_VERSION_MAJOR 54 | 32 | #define LIBAVFORMAT_VERSION_MAJOR 54 |
| 33 | #define LIBAVFORMAT_VERSION_MINOR 24 | 33 | #define LIBAVFORMAT_VERSION_MINOR 24 |
| 34 | #define LIBAVFORMAT_VERSION_MICRO 100 | 34 | #define LIBAVFORMAT_VERSION_MICRO 101 |
| 35 | 35 | ||
| 36 | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ | 36 | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |
| 37 | LIBAVFORMAT_VERSION_MINOR, \ | 37 | LIBAVFORMAT_VERSION_MINOR, \ |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include <stdint.h> | 22 | #include <stdint.h> |
| 23 | 23 | ||
| 24 | #include "config.h" | 24 | #include "config.h" |
| 25 | #include "libavutil/common.h" | ||
| 25 | #include "libavutil/libm.h" | 26 | #include "libavutil/libm.h" |
| 26 | #include "libavutil/log.h" | 27 | #include "libavutil/log.h" |
| 27 | #include "libavutil/mem.h" | 28 | #include "libavutil/mem.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <stdint.h> | 21 | #include <stdint.h> |
| 22 | #include <string.h> | ||
| 22 | 23 | ||
| 23 | #include "libavutil/mem.h" | 24 | #include "libavutil/mem.h" |
| 24 | #include "audio_data.h" | 25 | #include "audio_data.h" |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #include <stdint.h> | 21 | #include <stdint.h> |
| 22 | 22 | ||
| 23 | #include "libavutil/common.h" | ||
| 23 | #include "libavutil/libm.h" | 24 | #include "libavutil/libm.h" |
| 24 | #include "libavutil/samplefmt.h" | 25 | #include "libavutil/samplefmt.h" |
| 25 | #include "avresample.h" | 26 | #include "avresample.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include <stdint.h> | 22 | #include <stdint.h> |
| 23 | 23 | ||
| 24 | #include "libavutil/common.h" | ||
| 24 | #include "libavutil/libm.h" | 25 | #include "libavutil/libm.h" |
| 25 | #include "libavutil/samplefmt.h" | 26 | #include "libavutil/samplefmt.h" |
| 26 | #include "avresample.h" | 27 | #include "avresample.h" |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include <stdio.h> | 23 | #include <stdio.h> |
| 24 | 24 | ||
| 25 | #include "libavutil/avstring.h" | 25 | #include "libavutil/avstring.h" |
| 26 | #include "libavutil/common.h" | ||
| 26 | #include "libavutil/lfg.h" | 27 | #include "libavutil/lfg.h" |
| 27 | #include "libavutil/libm.h" | 28 | #include "libavutil/libm.h" |
| 28 | #include "libavutil/log.h" | 29 | #include "libavutil/log.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/mathematics.h" | 21 | #include "libavutil/mathematics.h" |
| 22 | #include "libavutil/mem.h" | ||
| 22 | #include "libavutil/opt.h" | 23 | #include "libavutil/opt.h" |
| 23 | #include "avresample.h" | 24 | #include "avresample.h" |
| 24 | #include "internal.h" | 25 | #include "internal.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/common.h" | ||
| 22 | #include "libavutil/libm.h" | 23 | #include "libavutil/libm.h" |
| 23 | #include "libavutil/log.h" | 24 | #include "libavutil/log.h" |
| 24 | #include "internal.h" | 25 | #include "internal.h" |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/common.h" | ||
| 21 | #include "libavutil/dict.h" | 22 | #include "libavutil/dict.h" |
| 22 | // #include "libavutil/error.h" | 23 | // #include "libavutil/error.h" |
| 23 | #include "libavutil/log.h" | 24 | #include "libavutil/log.h" |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | 26 | ||
| 27 | #include "avutil.h" | 27 | #include "avutil.h" |
| 28 | #include "audio_fifo.h" | 28 | #include "audio_fifo.h" |
| 29 | #include "common.h" | ||
| 29 | #include "fifo.h" | 30 | #include "fifo.h" |
| 30 | #include "mem.h" | 31 | #include "mem.h" |
| 31 | #include "samplefmt.h" | 32 | #include "samplefmt.h" |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include "avutil.h" | 27 | #include "avutil.h" |
| 28 | #include "audioconvert.h" | 28 | #include "audioconvert.h" |
| 29 | #include "bprint.h" | 29 | #include "bprint.h" |
| 30 | #include "common.h" | ||
| 30 | 31 | ||
| 31 | struct channel_name { | 32 | struct channel_name { |
| 32 | const char *name; | 33 | const char *name; |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <stdarg.h> | 22 | #include <stdarg.h> |
| 23 | #include <stdint.h> | ||
| 23 | #include <stdio.h> | 24 | #include <stdio.h> |
| 24 | #include <string.h> | 25 | #include <string.h> |
| 25 | #include <ctype.h> | 26 | #include <ctype.h> |
| @@ -212,6 +213,7 @@ int av_strncasecmp(const char *a, const char *b, size_t n) · 186 unmodified lines | |||
| 212 | 213 | ||
| 213 | #ifdef TEST | 214 | #ifdef TEST |
| 214 | 215 | ||
| 216 | #include "common.h" | ||
| 215 | #undef printf | 217 | #undef printf |
| 216 | 218 | ||
| 217 | int main(void) | 219 | int main(void) |
| @@ -18,6 +18,9 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <ctype.h> | ||
| 22 | #include <string.h> | ||
| 23 | |||
| 21 | #include "avstring.h" | 24 | #include "avstring.h" |
| 22 | #include "dict.h" | 25 | #include "dict.h" |
| 23 | #include "internal.h" | 26 | #include "internal.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | #undef _GNU_SOURCE | 19 | #undef _GNU_SOURCE |
| 20 | #include "avutil.h" | 20 | #include "avutil.h" |
| 21 | #include "avstring.h" | 21 | #include "avstring.h" |
| 22 | #include "common.h" | ||
| 22 | 23 | ||
| 23 | struct error_entry { | 24 | struct error_entry { |
| 24 | int num; | 25 | int num; |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | 28 | ||
| 29 | #include <float.h> | 29 | #include <float.h> |
| 30 | #include "avutil.h" | 30 | #include "avutil.h" |
| 31 | #include "common.h" | ||
| 31 | #include "eval.h" | 32 | #include "eval.h" |
| 32 | #include "log.h" | 33 | #include "log.h" |
| 33 | #include "mathematics.h" | 34 | #include "mathematics.h" |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | 26 | ||
| 27 | #include <stdint.h> | 27 | #include <stdint.h> |
| 28 | #include "avutil.h" | 28 | #include "avutil.h" |
| 29 | #include "attributes.h" | ||
| 29 | 30 | ||
| 30 | typedef struct AVFifoBuffer { | 31 | typedef struct AVFifoBuffer { |
| 31 | uint8_t *buffer; | 32 | uint8_t *buffer; |
| @@ -16,8 +16,10 @@ · 15 unmodified lines | |||
| 16 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 16 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include "config.h" | ||
| 19 | #include "file.h" | 20 | #include "file.h" |
| 20 | #include "log.h" | 21 | #include "log.h" |
| 22 | #include "mem.h" | ||
| 21 | #include <fcntl.h> | 23 | #include <fcntl.h> |
| 22 | #include <sys/stat.h> | 24 | #include <sys/stat.h> |
| 23 | #if HAVE_UNISTD_H | 25 | #if HAVE_UNISTD_H |
| @@ -19,6 +19,8 @@ · 18 unmodified lines | |||
| 19 | #ifndef AVUTIL_FILE_H | 19 | #ifndef AVUTIL_FILE_H |
| 20 | #define AVUTIL_FILE_H | 20 | #define AVUTIL_FILE_H |
| 21 | 21 | ||
| 22 | #include <stdint.h> | ||
| 23 | |||
| 22 | #include "avutil.h" | 24 | #include "avutil.h" |
| 23 | 25 | ||
| 24 | /** | 26 | /** |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | * misc image utilities | 21 | * misc image utilities |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include "common.h" | ||
| 24 | #include "imgutils.h" | 25 | #include "imgutils.h" |
| 25 | #include "internal.h" | 26 | #include "internal.h" |
| 26 | #include "intreadwrite.h" | 27 | #include "intreadwrite.h" |
| @@ -31,6 +31,7 @@ · 30 unmodified lines | |||
| 31 | #endif | 31 | #endif |
| 32 | #include <stdlib.h> | 32 | #include <stdlib.h> |
| 33 | #include "avutil.h" | 33 | #include "avutil.h" |
| 34 | #include "common.h" | ||
| 34 | #include "log.h" | 35 | #include "log.h" |
| 35 | 36 | ||
| 36 | #define LINE_SZ 1024 | 37 | #define LINE_SZ 1024 |
| @@ -26,6 +26,8 @@ · 25 unmodified lines | |||
| 26 | #ifndef AVUTIL_MEM_H | 26 | #ifndef AVUTIL_MEM_H |
| 27 | #define AVUTIL_MEM_H | 27 | #define AVUTIL_MEM_H |
| 28 | 28 | ||
| 29 | #include <limits.h> | ||
| 30 | |||
| 29 | #include "attributes.h" | 31 | #include "attributes.h" |
| 30 | #include "error.h" | 32 | #include "error.h" |
| 31 | #include "avutil.h" | 33 | #include "avutil.h" |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | 27 | ||
| 28 | #include "avutil.h" | 28 | #include "avutil.h" |
| 29 | #include "avstring.h" | 29 | #include "avstring.h" |
| 30 | #include "common.h" | ||
| 30 | #include "opt.h" | 31 | #include "opt.h" |
| 31 | #include "eval.h" | 32 | #include "eval.h" |
| 32 | #include "dict.h" | 33 | #include "dict.h" |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | #include "avstring.h" | 26 | #include "avstring.h" |
| 27 | #include "avutil.h" | 27 | #include "avutil.h" |
| 28 | #include "common.h" | ||
| 28 | #include "eval.h" | 29 | #include "eval.h" |
| 29 | #include "log.h" | 30 | #include "log.h" |
| 30 | #include "random_seed.h" | 31 | #include "random_seed.h" |
| @@ -16,6 +16,7 @@ · 15 unmodified lines | |||
| 16 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 16 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include "common.h" | ||
| 19 | #include "samplefmt.h" | 20 | #include "samplefmt.h" |
| 20 | 21 | ||
| 21 | #include <stdio.h> | 22 | #include <stdio.h> |
| @@ -19,7 +19,10 @@ · 18 unmodified lines | |||
| 19 | #ifndef AVUTIL_SAMPLEFMT_H | 19 | #ifndef AVUTIL_SAMPLEFMT_H |
| 20 | #define AVUTIL_SAMPLEFMT_H | 20 | #define AVUTIL_SAMPLEFMT_H |
| 21 | 21 | ||
| 22 | #include <stdint.h> | ||
| 23 | |||
| 22 | #include "avutil.h" | 24 | #include "avutil.h" |
| 25 | #include "attributes.h" | ||
| 23 | 26 | ||
| 24 | /** | 27 | /** |
| 25 | * Audio Sample Formats | 28 | * Audio Sample Formats |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | 28 | ||
| 29 | #include <stdlib.h> | 29 | #include <stdlib.h> |
| 30 | #include <stdint.h> | 30 | #include <stdint.h> |
| 31 | #include <inttypes.h> | ||
| 31 | 32 | ||
| 32 | #include "config.h" | 33 | #include "config.h" |
| 33 | 34 | ||
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "log.h" | 21 | #include "log.h" |
| 22 | #include "mem.h" | ||
| 22 | #include "tree.h" | 23 | #include "tree.h" |
| 23 | 24 | ||
| 24 | typedef struct AVTreeNode { | 25 | typedef struct AVTreeNode { |
| @@ -157,6 +158,7 @@ void av_tree_enumerate(AVTreeNode *t, void *opaque, · 132 unmodified lines | |||
| 157 | 158 | ||
| 158 | #ifdef TEST | 159 | #ifdef TEST |
| 159 | 160 | ||
| 161 | #include "common.h" | ||
| 160 | #include "lfg.h" | 162 | #include "lfg.h" |
| 161 | 163 | ||
| 162 | static int check(AVTreeNode *t) | 164 | static int check(AVTreeNode *t) |
| @@ -39,7 +39,7 @@ · 38 unmodified lines | |||
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #define LIBAVUTIL_VERSION_MAJOR 51 | 41 | #define LIBAVUTIL_VERSION_MAJOR 51 |
| 42 | #define LIBAVUTIL_VERSION_MINOR 69 | 42 | #define LIBAVUTIL_VERSION_MINOR 70 |
| 43 | #define LIBAVUTIL_VERSION_MICRO 100 | 43 | #define LIBAVUTIL_VERSION_MICRO 100 |
| 44 | 44 | ||
| 45 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ | 45 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |
| @@ -19,9 +19,11 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <inttypes.h> | ||
| 22 | #include <stdint.h> | 23 | #include <stdint.h> |
| 23 | #include <stdlib.h> | 24 | #include <stdlib.h> |
| 24 | #include <stdarg.h> | 25 | #include <stdarg.h> |
| 26 | #include <string.h> | ||
| 25 | 27 | ||
| 26 | #include "libavutil/bswap.h" | 28 | #include "libavutil/bswap.h" |
| 27 | 29 | ||
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | 26 | ||
| 27 | #include "swscale.h" | 27 | #include "swscale.h" |
| 28 | #include "rgb2rgb.h" | 28 | #include "rgb2rgb.h" |
| 29 | #include "libavutil/mem.h" | ||
| 29 | 30 | ||
| 30 | #define SIZE 1000 | 31 | #define SIZE 1000 |
| 31 | #define srcByte 0x55 | 32 | #define srcByte 0x55 |
| @@ -27,6 +27,8 @@ · 26 unmodified lines | |||
| 27 | * external api for the swscale stuff | 27 | * external api for the swscale stuff |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <stdint.h> | ||
| 31 | |||
| 30 | #include "libavutil/avutil.h" | 32 | #include "libavutil/avutil.h" |
| 31 | #include "libavutil/log.h" | 33 | #include "libavutil/log.h" |
| 32 | #include "libavutil/pixfmt.h" | 34 | #include "libavutil/pixfmt.h" |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | #endif | 28 | #endif |
| 29 | 29 | ||
| 30 | #include "libavutil/avutil.h" | 30 | #include "libavutil/avutil.h" |
| 31 | #include "libavutil/common.h" | ||
| 31 | #include "libavutil/log.h" | 32 | #include "libavutil/log.h" |
| 32 | #include "libavutil/pixfmt.h" | 33 | #include "libavutil/pixfmt.h" |
| 33 | #include "libavutil/pixdesc.h" | 34 | #include "libavutil/pixdesc.h" |
| @@ -19,7 +19,10 @@ · 18 unmodified lines | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <unistd.h> /* getopt */ | 21 | #include <unistd.h> /* getopt */ |
| 22 | #include <stdio.h> | ||
| 23 | #include <string.h> | ||
| 22 | 24 | ||
| 25 | #include "libavutil/mem.h" | ||
| 23 | #include "libavutil/pixdesc.h" | 26 | #include "libavutil/pixdesc.h" |
| 24 | #include "libavutil/audioconvert.h" | 27 | #include "libavutil/audioconvert.h" |
| 25 | #include "libavfilter/avfiltergraph.h" | 28 | #include "libavfilter/avfiltergraph.h" |