diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 12:27:33 +0300 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 12:35:10 +0300 |
| commit | ae753dbd0de448b51f0e0b980c26b94747ec44f5 (patch) | |
| tree | 505db82041ba42ecb799dd74e3b891b278172bd0 /libavcodec/smacker.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/smacker.c')
| -rw-r--r-- | libavcodec/smacker.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index f4fc16c42c..b8a0c558a6 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -32,13 +32,13 @@ #include <stdlib.h> #include "libavutil/channel_layout.h" -#include "avcodec.h" -#include "internal.h" -#include "mathops.h" #define BITSTREAM_READER_LE -#include "get_bits.h" +#include "avcodec.h" #include "bytestream.h" +#include "get_bits.h" +#include "internal.h" +#include "mathops.h" #define SMKTREE_BITS 9 #define SMK_NODE 0x80000000 |