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/g723_1dec.c | |
| parent | 543142990b6f7b8757753c13ea6dbc56275c5c7e (diff) | |
| parent | b668662939de3a02454cfc9ba3e6d10b87527a40 (diff) | |
| download | ffmpeg-streaming-ae753dbd0de448b51f0e0b980c26b94747ec44f5.zip ffmpeg-streaming-ae753dbd0de448b51f0e0b980c26b94747ec44f5.tar.gz | |
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/g723_1dec.c')
| -rw-r--r-- | libavcodec/g723_1dec.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/g723_1dec.c b/libavcodec/g723_1dec.c index 6f283b4..e9896b5 100644 --- a/libavcodec/g723_1dec.c +++ b/libavcodec/g723_1dec.c @@ -25,17 +25,18 @@ * G.723.1 compatible decoder */ -#define BITSTREAM_READER_LE #include "libavutil/channel_layout.h" #include "libavutil/mem.h" #include "libavutil/opt.h" -#include "avcodec.h" -#include "get_bits.h" + +#define BITSTREAM_READER_LE #include "acelp_vectors.h" +#include "avcodec.h" #include "celp_filters.h" #include "celp_math.h" -#include "g723_1.h" +#include "get_bits.h" #include "internal.h" +#include "g723_1.h" #define CNG_RANDOM_SEED 12345 |
