diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-26 01:39:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-26 01:54:55 +0100 |
| commit | 965fa6b0d9d99afbbef8b3fcb8066ce4136b8c35 (patch) | |
| tree | 1c00ee6a0981502047f9c0a3e53ec79a7af900b9 /libavcodec | |
| parent | 53167ecfdb99151c1f0d243275675a75efb881a7 (diff) | |
| parent | fb0c9d41d685abb58575c5482ca33b8cd457c5ec (diff) | |
| download | ffmpeg-965fa6b0d9d99afbbef8b3fcb8066ce4136b8c35.tar.gz | |
Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'
* commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec':
avutil: remove timer.h include from internal.h
Conflicts:
libavcodec/ffv1dec.c
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/cabac.c | 1 | ||||
| -rw-r--r-- | libavcodec/dnxhddec.c | 1 | ||||
| -rw-r--r-- | libavcodec/dnxhdenc.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264_cabac.c | 1 | ||||
| -rw-r--r-- | libavcodec/ivi_common.c | 1 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 1 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c index dff0a91273..65579d8d3b 100644 --- a/libavcodec/cabac.c +++ b/libavcodec/cabac.c @@ -27,6 +27,7 @@ #include <string.h> #include "libavutil/common.h" +#include "libavutil/timer.h" #include "get_bits.h" #include "cabac.h" #include "cabac_functions.h" diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 42775dfd2b..7040fc34b3 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -23,6 +23,7 @@ */ #include "libavutil/imgutils.h" +#include "libavutil/timer.h" #include "avcodec.h" #include "get_bits.h" #include "dnxhddata.h" diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index eaea242b6c..fb37a9d3e2 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -28,6 +28,7 @@ #include "libavutil/attributes.h" #include "libavutil/internal.h" #include "libavutil/opt.h" +#include "libavutil/timer.h" #include "avcodec.h" #include "dsputil.h" #include "internal.h" diff --git a/libavcodec/h264.c b/libavcodec/h264.c index e90f5712a5..3849d9b884 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -31,6 +31,7 @@ #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/stereo3d.h" +#include "libavutil/timer.h" #include "internal.h" #include "cabac.h" #include "cabac_functions.h" diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index d35c408788..83aac22bbf 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -29,6 +29,7 @@ #define UNCHECKED_BITSTREAM_READER 1 #include "libavutil/attributes.h" +#include "libavutil/timer.h" #include "config.h" #include "cabac.h" #include "cabac_functions.h" diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index a4d24345a7..b24d44fc40 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -28,6 +28,7 @@ #define BITSTREAM_READER_LE #include "libavutil/attributes.h" +#include "libavutil/timer.h" #include "avcodec.h" #include "get_bits.h" #include "internal.h" diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 2b3db2fb6f..39f40cc0ee 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -31,6 +31,7 @@ #include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" +#include "libavutil/timer.h" #include "avcodec.h" #include "dsputil.h" #include "h264chroma.h" diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index eb31814780..fa695ad20b 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -34,6 +34,7 @@ #include "libavutil/mathematics.h" #include "libavutil/pixdesc.h" #include "libavutil/opt.h" +#include "libavutil/timer.h" #include "avcodec.h" #include "dct.h" #include "dsputil.h" |