diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 11:27:33 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 11:35:10 +0200 |
| commit | ae753dbd0de448b51f0e0b980c26b94747ec44f5 (patch) | |
| tree | 505db82041ba42ecb799dd74e3b891b278172bd0 /libavcodec/dxtory.c | |
| parent | 543142990b6f7b8757753c13ea6dbc56275c5c7e (diff) | |
| parent | b668662939de3a02454cfc9ba3e6d10b87527a40 (diff) | |
Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'
* commit 'b668662939de3a02454cfc9ba3e6d10b87527a40':
get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes
The merge commit also includes changes for libavcodec/interplayacm.c and
libavcodec/truemotion2rt.c
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec/dxtory.c')
| -rw-r--r-- | libavcodec/dxtory.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index fc1936985d..ea5da610da 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, |