aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ivi.c
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2016-06-29 11:27:33 +0200
committerClément Bœsch <clement@stupeflix.com>2016-06-29 11:35:10 +0200
commitae753dbd0de448b51f0e0b980c26b94747ec44f5 (patch)
tree505db82041ba42ecb799dd74e3b891b278172bd0 /libavcodec/ivi.c
parent543142990b6f7b8757753c13ea6dbc56275c5c7e (diff)
parentb668662939de3a02454cfc9ba3e6d10b87527a40 (diff)
downloadffmpeg-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/ivi.c')
-rw-r--r--libavcodec/ivi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c
index a1eab941d2..70f08a8503 100644
--- a/libavcodec/ivi.c
+++ b/libavcodec/ivi.c
@@ -28,10 +28,11 @@
#include <inttypes.h>
-#define BITSTREAM_READER_LE
#include "libavutil/attributes.h"
#include "libavutil/imgutils.h"
#include "libavutil/timer.h"
+
+#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"