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/metasound.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/metasound.c')
-rw-r--r-- | libavcodec/metasound.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c index 5a7f4c3fa1..6a7e31a26b 100644 --- a/libavcodec/metasound.c +++ b/libavcodec/metasound.c @@ -25,12 +25,13 @@ #include <math.h> #include <stdint.h> -#define BITSTREAM_READER_LE #include "libavutil/channel_layout.h" #include "libavutil/float_dsp.h" + +#define BITSTREAM_READER_LE #include "avcodec.h" -#include "get_bits.h" #include "fft.h" +#include "get_bits.h" #include "internal.h" #include "lsp.h" #include "sinewin.h" |