diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 14:12:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 15:09:58 +0100 |
| commit | efc4439c894be9f45ec472ad2471143f94abc399 (patch) | |
| tree | eb5aecf2581cbbf83f6d8cc8a4fa2054a83c0c82 /libavcodec/ra144enc.c | |
| parent | 8cc581fbf77ac25deb9eb9398cf4c759857aaeaa (diff) | |
| parent | 973dc4e8d4ae0def273c33bac354ddc6d8e0c470 (diff) | |
| download | ffmpeg-efc4439c894be9f45ec472ad2471143f94abc399.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
put_bits: Remove unused includes
Conflicts:
libavcodec/put_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ra144enc.c')
| -rw-r--r-- | libavcodec/ra144enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 0db6032615..d09e281e12 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -29,9 +29,10 @@ #include "avcodec.h" #include "audio_frame_queue.h" +#include "celp_filters.h" #include "internal.h" +#include "mathops.h" #include "put_bits.h" -#include "celp_filters.h" #include "ra144.h" |