diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-16 18:12:45 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-16 18:20:30 +0400 |
commit | c581cb4e4fd3f8387766d3606560b2900728883a (patch) | |
tree | ecaecc6d276510379d8e399e88937c10a778be85 /libavutil | |
parent | 208d6e6615e3c2e09de5aab92745e13da86aa827 (diff) | |
parent | 232e35de2e139cc2d34ed67a34dedbbc5da56052 (diff) |
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 'libavutil')
-rw-r--r-- | libavutil/audio_fifo.c | 1 | ||||
-rw-r--r-- | libavutil/audioconvert.c | 1 | ||||
-rw-r--r-- | libavutil/avstring.c | 2 | ||||
-rw-r--r-- | libavutil/dict.c | 3 | ||||
-rw-r--r-- | libavutil/error.c | 1 | ||||
-rw-r--r-- | libavutil/eval.c | 1 | ||||
-rw-r--r-- | libavutil/fifo.h | 1 | ||||
-rw-r--r-- | libavutil/file.c | 2 | ||||
-rw-r--r-- | libavutil/file.h | 2 | ||||
-rw-r--r-- | libavutil/imgutils.c | 1 | ||||
-rw-r--r-- | libavutil/log.c | 1 | ||||
-rw-r--r-- | libavutil/mem.h | 2 | ||||
-rw-r--r-- | libavutil/opt.c | 1 | ||||
-rw-r--r-- | libavutil/parseutils.c | 1 | ||||
-rw-r--r-- | libavutil/samplefmt.c | 1 | ||||
-rw-r--r-- | libavutil/samplefmt.h | 3 | ||||
-rw-r--r-- | libavutil/timer.h | 1 | ||||
-rw-r--r-- | libavutil/tree.c | 2 | ||||
-rw-r--r-- | libavutil/version.h | 2 | ||||
-rw-r--r-- | libavutil/x86/w64xmmtest.h | 2 |
20 files changed, 30 insertions, 1 deletions
diff --git a/libavutil/audio_fifo.c b/libavutil/audio_fifo.c index 97c51a72c1..b562537cf6 100644 --- a/libavutil/audio_fifo.c +++ b/libavutil/audio_fifo.c @@ -26,6 +26,7 @@ #include "avutil.h" #include "audio_fifo.h" +#include "common.h" #include "fifo.h" #include "mem.h" #include "samplefmt.h" diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c index 01641711d6..4f6f7e3234 100644 --- a/libavutil/audioconvert.c +++ b/libavutil/audioconvert.c @@ -27,6 +27,7 @@ #include "avutil.h" #include "audioconvert.h" #include "bprint.h" +#include "common.h" struct channel_name { const char *name; diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 76f6bb2c9b..8b258a4971 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdint.h> #include <stdio.h> #include <string.h> #include <ctype.h> @@ -212,6 +213,7 @@ int av_strncasecmp(const char *a, const char *b, size_t n) #ifdef TEST +#include "common.h" #undef printf int main(void) diff --git a/libavutil/dict.c b/libavutil/dict.c index 6d2d8c8dec..7e7d1cc4a8 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <ctype.h> +#include <string.h> + #include "avstring.h" #include "dict.h" #include "internal.h" diff --git a/libavutil/error.c b/libavutil/error.c index 98a60c20ae..7111644145 100644 --- a/libavutil/error.c +++ b/libavutil/error.c @@ -19,6 +19,7 @@ #undef _GNU_SOURCE #include "avutil.h" #include "avstring.h" +#include "common.h" struct error_entry { int num; diff --git a/libavutil/eval.c b/libavutil/eval.c index 6aa257efc4..dc2fb45cde 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -28,6 +28,7 @@ #include <float.h> #include "avutil.h" +#include "common.h" #include "eval.h" #include "log.h" #include "mathematics.h" diff --git a/libavutil/fifo.h b/libavutil/fifo.h index 515f0980a7..ff66c95daa 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -26,6 +26,7 @@ #include <stdint.h> #include "avutil.h" +#include "attributes.h" typedef struct AVFifoBuffer { uint8_t *buffer; diff --git a/libavutil/file.c b/libavutil/file.c index d52a2e803f..8dbeab6b0f 100644 --- a/libavutil/file.c +++ b/libavutil/file.c @@ -16,8 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "file.h" #include "log.h" +#include "mem.h" #include <fcntl.h> #include <sys/stat.h> #if HAVE_UNISTD_H diff --git a/libavutil/file.h b/libavutil/file.h index f3af9ef7e5..f637005d87 100644 --- a/libavutil/file.h +++ b/libavutil/file.h @@ -19,6 +19,8 @@ #ifndef AVUTIL_FILE_H #define AVUTIL_FILE_H +#include <stdint.h> + #include "avutil.h" /** diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 67368f0679..a3d40877b1 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -21,6 +21,7 @@ * misc image utilities */ +#include "common.h" #include "imgutils.h" #include "internal.h" #include "intreadwrite.h" diff --git a/libavutil/log.c b/libavutil/log.c index 53c756b561..1bae1b2165 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -31,6 +31,7 @@ #endif #include <stdlib.h> #include "avutil.h" +#include "common.h" #include "log.h" #define LINE_SZ 1024 diff --git a/libavutil/mem.h b/libavutil/mem.h index 4f1e6a0cdf..212dbf1773 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -26,6 +26,8 @@ #ifndef AVUTIL_MEM_H #define AVUTIL_MEM_H +#include <limits.h> + #include "attributes.h" #include "error.h" #include "avutil.h" diff --git a/libavutil/opt.c b/libavutil/opt.c index 0adbdddace..fa1d1227a6 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -27,6 +27,7 @@ #include "avutil.h" #include "avstring.h" +#include "common.h" #include "opt.h" #include "eval.h" #include "dict.h" diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 22c45dbac5..588441136d 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -25,6 +25,7 @@ #include "avstring.h" #include "avutil.h" +#include "common.h" #include "eval.h" #include "log.h" #include "random_seed.h" diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c index 838d99c7f1..a03648e200 100644 --- a/libavutil/samplefmt.c +++ b/libavutil/samplefmt.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "common.h" #include "samplefmt.h" #include <stdio.h> diff --git a/libavutil/samplefmt.h b/libavutil/samplefmt.h index 4ce606d975..681e521c69 100644 --- a/libavutil/samplefmt.h +++ b/libavutil/samplefmt.h @@ -19,7 +19,10 @@ #ifndef AVUTIL_SAMPLEFMT_H #define AVUTIL_SAMPLEFMT_H +#include <stdint.h> + #include "avutil.h" +#include "attributes.h" /** * Audio Sample Formats diff --git a/libavutil/timer.h b/libavutil/timer.h index 8a5caecd6c..3e242f3463 100644 --- a/libavutil/timer.h +++ b/libavutil/timer.h @@ -28,6 +28,7 @@ #include <stdlib.h> #include <stdint.h> +#include <inttypes.h> #include "config.h" diff --git a/libavutil/tree.c b/libavutil/tree.c index 58cd33d770..4206539c37 100644 --- a/libavutil/tree.c +++ b/libavutil/tree.c @@ -19,6 +19,7 @@ */ #include "log.h" +#include "mem.h" #include "tree.h" typedef struct AVTreeNode { @@ -157,6 +158,7 @@ void av_tree_enumerate(AVTreeNode *t, void *opaque, #ifdef TEST +#include "common.h" #include "lfg.h" static int check(AVTreeNode *t) diff --git a/libavutil/version.h b/libavutil/version.h index 0e381b75ae..0b9ae393a9 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -39,7 +39,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 69 +#define LIBAVUTIL_VERSION_MINOR 70 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/libavutil/x86/w64xmmtest.h b/libavutil/x86/w64xmmtest.h index 1c1ded86ec..b4ce7d3daf 100644 --- a/libavutil/x86/w64xmmtest.h +++ b/libavutil/x86/w64xmmtest.h @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> #include <stdint.h> #include <stdlib.h> #include <stdarg.h> +#include <string.h> #include "libavutil/bswap.h" |