diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-10 03:57:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-10 03:58:00 +0100 |
| commit | c47fc0339a7fae6a39508dd3f7fbcac5cf27fda8 (patch) | |
| tree | 90f3229f5447380470cec2559f8d3949b0c8d6aa /libavutil | |
| parent | d9481dcd612b5f020e3c2137c301406a5eb1aa90 (diff) | |
| parent | 02b9fafcca581158444e480b6c46fed704e24535 (diff) | |
| download | ffmpeg-c47fc0339a7fae6a39508dd3f7fbcac5cf27fda8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avutil: do not use avcodec header in frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index 1222d3c9e1..5e113fabb5 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -22,13 +22,12 @@ #include <stdint.h> -#include "libavcodec/version.h" - #include "avutil.h" #include "buffer.h" #include "dict.h" #include "rational.h" #include "samplefmt.h" +#include "version.h" enum AVColorSpace{ AVCOL_SPC_RGB = 0, |