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>

diff --cc libavcodec/bink.c
Simple merge

diff --cc libavcodec/binkaudio.c
Simple merge

diff --cc libavcodec/dxtory.c
Simple merge

diff --cc libavcodec/eatgq.c
Simple merge

diff --cc libavcodec/eatgv.c
Simple merge

diff --cc libavcodec/escape124.c
Simple merge

diff --cc libavcodec/escape130.c
Simple merge

diff --cc libavcodec/g723_1dec.c
index 6f283b4,f50bed1..e9896b5
--- 1/libavcodec/g723_1dec.c
--- 2/libavcodec/g723_1dec.c
+++ b/libavcodec/g723_1dec.c
@@@ -28,14 -28,14 +28,15 @@@
  #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 "g723_1.h"
 +#include "celp_math.h"
+ #include "get_bits.h"
  #include "internal.h"
+ #include "g723_1.h"
  
  #define CNG_RANDOM_SEED 12345
  

diff --cc libavcodec/indeo2.c
Simple merge

diff --cc libavcodec/indeo4.c
Simple merge

diff --cc libavcodec/interplayvideo.c
index 88c610d,e0d1e91..aa03015
--- 1/libavcodec/interplayvideo.c
--- 2/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@@ -38,12 -38,11 +38,13 @@@
  #include <stdlib.h>
  #include <string.h>
  
 +#include "libavutil/intreadwrite.h"
++
+ #define BITSTREAM_READER_LE
  #include "avcodec.h"
  #include "bytestream.h"
- #include "hpeldsp.h"
- #define BITSTREAM_READER_LE
  #include "get_bits.h"
+ #include "hpeldsp.h"
  #include "internal.h"
  
  #define PALETTE_COUNT 256

diff --cc libavcodec/ivi.c
index a1eab94,8a59777..70f08a8
--- 1/libavcodec/ivi.c
--- 2/libavcodec/ivi.c
+++ b/libavcodec/ivi.c
@@@ -28,10 -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"

diff --cc libavcodec/metasound.c
Simple merge

diff --cc libavcodec/msgsmdec.c
Simple merge

diff --cc libavcodec/nellymoserdec.c
Simple merge

diff --cc libavcodec/qdm2.c
index 074aafd,ec57b35..dd8b257
--- 1/libavcodec/qdm2.c
--- 2/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@@ -40,12 -41,14 +41,12 @@@
  #include "avcodec.h"
  #include "get_bits.h"
  #include "internal.h"
- #include "rdft.h"
- #include "mpegaudiodsp.h"
  #include "mpegaudio.h"
+ #include "mpegaudiodsp.h"
+ #include "rdft.h"
  
 -#include "qdm2data.h"
  #include "qdm2_tablegen.h"
  
 -
  #define QDM2_LIST_ADD(list, size, packet) \
  do { \
        if (size > 0) { \

diff --cc libavcodec/ra288.c
Simple merge

diff --cc libavcodec/sipr.c
Simple merge

diff --cc libavcodec/smacker.c
Simple merge

diff --cc libavcodec/tak.c
index ed41ca8,bd82c3d..d2670e0
--- 1/libavcodec/tak.c
--- 2/libavcodec/tak.c
+++ b/libavcodec/tak.c
@@@ -19,32 -19,13 +19,34 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
 -#include "libavutil/bswap.h"
  #include "libavutil/crc.h"
  #include "libavutil/intreadwrite.h"
+ 
+ #define BITSTREAM_READER_LE
  #include "tak.h"
  
 +static const int64_t tak_channel_layouts[] = {
 +    0,
 +    AV_CH_FRONT_LEFT,
 +    AV_CH_FRONT_RIGHT,
 +    AV_CH_FRONT_CENTER,
 +    AV_CH_LOW_FREQUENCY,
 +    AV_CH_BACK_LEFT,
 +    AV_CH_BACK_RIGHT,
 +    AV_CH_FRONT_LEFT_OF_CENTER,
 +    AV_CH_FRONT_RIGHT_OF_CENTER,
 +    AV_CH_BACK_CENTER,
 +    AV_CH_SIDE_LEFT,
 +    AV_CH_SIDE_RIGHT,
 +    AV_CH_TOP_CENTER,
 +    AV_CH_TOP_FRONT_LEFT,
 +    AV_CH_TOP_FRONT_CENTER,
 +    AV_CH_TOP_FRONT_RIGHT,
 +    AV_CH_TOP_BACK_LEFT,
 +    AV_CH_TOP_BACK_CENTER,
 +    AV_CH_TOP_BACK_RIGHT,
 +};
 +
  static const uint16_t frame_duration_type_quants[] = {
      3, 4, 6, 8, 4096, 8192, 16384, 512, 1024, 2048,
  };

diff --cc libavcodec/tak.h
Simple merge

diff --cc libavcodec/tak_parser.c
Simple merge

diff --cc libavcodec/takdec.c
index 023bc87,c9db928..9773281
--- 1/libavcodec/takdec.c
--- 2/libavcodec/takdec.c
+++ b/libavcodec/takdec.c
@@@ -27,15 -27,15 +27,17 @@@
  
  #include "libavutil/internal.h"
  #include "libavutil/samplefmt.h"
- #include "tak.h"
- #include "takdsp.h"
+ 
+ #define BITSTREAM_READER_LE
  #include "audiodsp.h"
 +#include "thread.h"
  #include "avcodec.h"
  #include "internal.h"
  #include "unary.h"
+ #include "tak.h"
++#include "takdsp.h"
  
 -#define MAX_SUBFRAMES     8                         // max number of subframes per channel
 +#define MAX_SUBFRAMES     8                         ///< max number of subframes per channel
  #define MAX_PREDICTORS  256
  
  typedef struct MCDParam {

diff --cc libavcodec/tiertexseqv.c
Simple merge

diff --cc libavcodec/tscc2.c
Simple merge

diff --cc libavcodec/tta.c
index 1e2e9c4,2b57406..9cb044e
--- 1/libavcodec/tta.c
--- 2/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@@ -27,18 -27,14 +27,20 @@@
   * @author Alex Beregszaszi
   */
  
- #define BITSTREAM_READER_LE
  #include <limits.h>
+ 
+ #include "libavutil/crc.h"
++#include "libavutil/intreadwrite.h"
++#include "libavutil/opt.h"
+ 
+ #define BITSTREAM_READER_LE
 +#include "ttadata.h"
 +#include "ttadsp.h"
  #include "avcodec.h"
  #include "get_bits.h"
 +#include "thread.h"
 +#include "unary.h"
  #include "internal.h"
- #include "libavutil/crc.h"
- #include "libavutil/intreadwrite.h"
- #include "libavutil/opt.h"
  
  #define FORMAT_SIMPLE    1
  #define FORMAT_ENCRYPTED 2

diff --cc libavcodec/vble.c
Simple merge

diff --cc libavcodec/vorbis.c
Simple merge

diff --cc libavcodec/vorbisdec.c
index 225f1e9,8b800fd..0a5eaa6
--- 1/libavcodec/vorbisdec.c
--- 2/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@@ -29,14 -25,13 +29,14 @@@
  #include <inttypes.h>
  #include <math.h>
  
- #define BITSTREAM_READER_LE
- #include "libavutil/float_dsp.h"
 +#include "libavutil/avassert.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 "vorbis.h"
  #include "vorbisdsp.h"
  #include "xiph.h"

diff --cc libavcodec/wavpack.c
index b6022f0,7f55f51..071e2be
--- 1/libavcodec/wavpack.c
--- 2/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@@ -19,16 -19,14 +19,16 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
- #define BITSTREAM_READER_LE
- 
  #include "libavutil/channel_layout.h"
+ 
+ #define BITSTREAM_READER_LE
  #include "avcodec.h"
+ #include "bytestream.h"
  #include "get_bits.h"
  #include "internal.h"
 +#include "thread.h"
  #include "unary.h"
- #include "bytestream.h"
 +#include "wavpack.h"
  
  /**
   * @file

diff --cc libavcodec/webp.c
index e715c4b,b26399c..45abfdc
--- 1/libavcodec/webp.c
--- 2/libavcodec/webp.c
+++ b/libavcodec/webp.c
@@@ -37,16 -34,16 +37,17 @@@
   * Unimplemented:
   *   - Animation
   *   - ICC profile
 - *   - Exif and XMP metadata
 + *   - XMP metadata
   */
  
- #define BITSTREAM_READER_LE
  #include "libavutil/imgutils.h"
+ 
+ #define BITSTREAM_READER_LE
  #include "avcodec.h"
  #include "bytestream.h"
- #include "internal.h"
 +#include "exif.h"
  #include "get_bits.h"
+ #include "internal.h"
  #include "thread.h"
  #include "vp8.h"
  

diff --cc libavcodec/xan.c
Simple merge

diff --cc libavformat/takdec.c
index 4b4124f,b28d44c..a8fb363
--- 1/libavformat/takdec.c
--- 2/libavformat/takdec.c
+++ b/libavformat/takdec.c
@@@ -19,13 -19,13 +19,16 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
 +#include "libavutil/crc.h"
++
+ #define BITSTREAM_READER_LE
  #include "libavcodec/tak.h"
+ 
+ #include "apetag.h"
  #include "avformat.h"
 +#include "avio_internal.h"
  #include "internal.h"
  #include "rawdec.h"
- #include "apetag.h"
  
  typedef struct TAKDemuxContext {
      int     mlast_frame;