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/msgsmdec.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/msgsmdec.c')
-rw-r--r-- | libavcodec/msgsmdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/msgsmdec.c b/libavcodec/msgsmdec.c index 4c4ddb46f5..003bc2c864 100644 --- a/libavcodec/msgsmdec.c +++ b/libavcodec/msgsmdec.c @@ -21,8 +21,9 @@ #define BITSTREAM_READER_LE #include "avcodec.h" -#include "msgsmdec.h" #include "gsm.h" +#include "msgsmdec.h" + #include "gsmdec_template.c" int ff_msgsm_decode_block(AVCodecContext *avctx, int16_t *samples, |