diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 12:50:55 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 12:51:01 +0200 |
commit | 803445e02c773fc29040629abdc297534ab6c3f3 (patch) | |
tree | f4af5e0b5e8527a7d6a280978d569502dd1e4d24 /libavutil/pixfmt.h | |
parent | c45e9097d839e69ab74160386db5e9728deaaf62 (diff) | |
parent | a0b901a348e435f0234440736670fc9e8fcca836 (diff) | |
download | ffmpeg-803445e02c773fc29040629abdc297534ab6c3f3.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Drop pointless directory name prefixes from #includes in the current dir
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/pixfmt.h')
-rw-r--r-- | libavutil/pixfmt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 8489a39770..4fc9c7fb7b 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -28,7 +28,7 @@ */ #include "libavutil/avconfig.h" -#include "libavutil/version.h" +#include "version.h" #define AVPALETTE_SIZE 1024 #define AVPALETTE_COUNT 256 |