summaryrefslogtreecommitdiff
path: root/libavcodec/dxtory.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-06-04 15:07:30 +0200
committerDiego Biurrun <diego@biurrun.de>2016-06-07 13:09:57 +0200
commitb668662939de3a02454cfc9ba3e6d10b87527a40 (patch)
tree9e5dbb2e75d332aba61ddeec9a3322fbc165abcc /libavcodec/dxtory.c
parent09c4e5c5988c0037d108c5fc2a137d9ad488f7f4 (diff)
get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes
This avoids the danger that get_bits.h might get indirectly #included before BITSTREAM_READER_LE is defined. Also sort headers into canonical order where appropriate.
Diffstat (limited to 'libavcodec/dxtory.c')
-rw-r--r--libavcodec/dxtory.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index 01726b982e..937b96c839 100644
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -22,14 +22,15 @@
#include <inttypes.h>
+#include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
+
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "bytestream.h"
#include "get_bits.h"
#include "internal.h"
#include "unary.h"
-#include "libavutil/common.h"
-#include "libavutil/intreadwrite.h"
static int dxtory_decode_v1_rgb(AVCodecContext *avctx, AVFrame *pic,
const uint8_t *src, int src_size,