diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-16 16:12:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-16 16:20:30 +0200 |
| commit | c581cb4e4fd3f8387766d3606560b2900728883a (patch) | |
| tree | ecaecc6d276510379d8e399e88937c10a778be85 /libavresample | |
| parent | 208d6e6615e3c2e09de5aab92745e13da86aa827 (diff) | |
| parent | 232e35de2e139cc2d34ed67a34dedbbc5da56052 (diff) | |
| download | ffmpeg-c581cb4e4fd3f8387766d3606560b2900728883a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Fix even more missing includes after the common.h removal
build: Factor out rangecoder dependencies to CONFIG_RANGECODER
build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE
x86: avcodec: Consistently name all init files
Add more missing includes after removing the implicit common.h
Add some more missing includes after removing the implicit common.h
Don't include common.h from avutil.h
rtmp: Automatically compute the hash for SWFVerification
Conflicts:
configure
doc/APIchanges
doc/examples/decoding_encoding.c
libavcodec/Makefile
libavcodec/assdec.c
libavcodec/audio_frame_queue.c
libavcodec/avpacket.c
libavcodec/dv_profile.c
libavcodec/dwt.c
libavcodec/libtheoraenc.c
libavcodec/rawdec.c
libavcodec/rv40dsp.c
libavcodec/tiff.c
libavcodec/tiffenc.c
libavcodec/v210dec.h
libavcodec/vc1dsp.c
libavcodec/x86/Makefile
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.c
libavfilter/buffer.c
libavfilter/formats.c
libavfilter/vf_ass.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_select.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavformat/version.h
libavutil/audioconvert.c
libavutil/error.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
| -rw-r--r-- | libavresample/audio_convert.c | 1 | ||||
| -rw-r--r-- | libavresample/audio_data.c | 1 | ||||
| -rw-r--r-- | libavresample/audio_mix.c | 1 | ||||
| -rw-r--r-- | libavresample/audio_mix_matrix.c | 1 | ||||
| -rw-r--r-- | libavresample/avresample-test.c | 1 | ||||
| -rw-r--r-- | libavresample/options.c | 1 | ||||
| -rw-r--r-- | libavresample/resample.c | 1 | ||||
| -rw-r--r-- | libavresample/utils.c | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/libavresample/audio_convert.c b/libavresample/audio_convert.c index 200eb100cc..1138ef8877 100644 --- a/libavresample/audio_convert.c +++ b/libavresample/audio_convert.c @@ -22,6 +22,7 @@ #include <stdint.h> #include "config.h" +#include "libavutil/common.h" #include "libavutil/libm.h" #include "libavutil/log.h" #include "libavutil/mem.h" diff --git a/libavresample/audio_data.c b/libavresample/audio_data.c index 3f82c50ef0..d624ad3796 100644 --- a/libavresample/audio_data.c +++ b/libavresample/audio_data.c @@ -19,6 +19,7 @@ */ #include <stdint.h> +#include <string.h> #include "libavutil/mem.h" #include "audio_data.h" diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c index f948c82788..dd2f33d27f 100644 --- a/libavresample/audio_mix.c +++ b/libavresample/audio_mix.c @@ -20,6 +20,7 @@ #include <stdint.h> +#include "libavutil/common.h" #include "libavutil/libm.h" #include "libavutil/samplefmt.h" #include "avresample.h" diff --git a/libavresample/audio_mix_matrix.c b/libavresample/audio_mix_matrix.c index 522a177f20..3fbc4a4264 100644 --- a/libavresample/audio_mix_matrix.c +++ b/libavresample/audio_mix_matrix.c @@ -21,6 +21,7 @@ #include <stdint.h> +#include "libavutil/common.h" #include "libavutil/libm.h" #include "libavutil/samplefmt.h" #include "avresample.h" diff --git a/libavresample/avresample-test.c b/libavresample/avresample-test.c index ad2f16d6f6..0d4f2df37c 100644 --- a/libavresample/avresample-test.c +++ b/libavresample/avresample-test.c @@ -23,6 +23,7 @@ #include <stdio.h> #include "libavutil/avstring.h" +#include "libavutil/common.h" #include "libavutil/lfg.h" #include "libavutil/libm.h" #include "libavutil/log.h" diff --git a/libavresample/options.c b/libavresample/options.c index e7e0c27c4d..53076f4b3a 100644 --- a/libavresample/options.c +++ b/libavresample/options.c @@ -19,6 +19,7 @@ */ #include "libavutil/mathematics.h" +#include "libavutil/mem.h" #include "libavutil/opt.h" #include "avresample.h" #include "internal.h" diff --git a/libavresample/resample.c b/libavresample/resample.c index e6e0892c10..f0af1ffd58 100644 --- a/libavresample/resample.c +++ b/libavresample/resample.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/libm.h" #include "libavutil/log.h" #include "internal.h" diff --git a/libavresample/utils.c b/libavresample/utils.c index 7588111003..81292930d4 100644 --- a/libavresample/utils.c +++ b/libavresample/utils.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/dict.h" // #include "libavutil/error.h" #include "libavutil/log.h" |