diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 14:50:55 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 14:51:01 +0400 |
commit | 803445e02c773fc29040629abdc297534ab6c3f3 (patch) | |
tree | f4af5e0b5e8527a7d6a280978d569502dd1e4d24 /libswscale | |
parent | c45e9097d839e69ab74160386db5e9728deaaf62 (diff) | |
parent | a0b901a348e435f0234440736670fc9e8fcca836 (diff) |
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 'libswscale')
-rw-r--r-- | libswscale/rgb2rgb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h index c6d514f089..340cc70205 100644 --- a/libswscale/rgb2rgb.h +++ b/libswscale/rgb2rgb.h @@ -28,8 +28,8 @@ #include <inttypes.h> -#include "libswscale/swscale.h" #include "libavutil/avutil.h" +#include "swscale.h" /* A full collection of RGB to RGB(BGR) converters */ extern void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, int src_size); |