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 /libavformat | |
| 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 'libavformat')
| -rw-r--r-- | libavformat/takdec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/takdec.c b/libavformat/takdec.c index 4b4124f9d4..a8fb363b34 100644 --- a/libavformat/takdec.c +++ b/libavformat/takdec.c @@ -20,12 +20,15 @@ */ #include "libavutil/crc.h" + +#define BITSTREAM_READER_LE #include "libavcodec/tak.h" + +#include "apetag.h" #include "avformat.h" #include "avio_internal.h" #include "internal.h" #include "rawdec.h" -#include "apetag.h" typedef struct TAKDemuxContext { int mlast_frame; |