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 /libavcodec | |
| 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 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavcodec/s3tc.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 66d7a8bab3..4ba0d6b2dd 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -40,7 +40,8 @@ #include "libavutil/pixfmt.h" #include "libavutil/rational.h" -#include "libavcodec/version.h" +#include "version.h" + /** * @defgroup libavc Encoding/Decoding Library * @{ diff --git a/libavcodec/s3tc.c b/libavcodec/s3tc.c index 4e791c86c0..4743d784fc 100644 --- a/libavcodec/s3tc.c +++ b/libavcodec/s3tc.c @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/bytestream.h" #include "avcodec.h" +#include "bytestream.h" #include "s3tc.h" static inline void dxt1_decode_pixels(GetByteContext *gb, uint32_t *d, |