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 /libavutil/internal.h | |
| 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 'libavutil/internal.h')
| -rw-r--r-- | libavutil/internal.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h index 9c5546f3b1..4de5226d97 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -36,7 +36,6 @@ #include <assert.h> #include "config.h" #include "attributes.h" -#include "timer.h" #include "cpu.h" #include "dict.h" #include "version.h" |