Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:27:33 +0000 (11:27 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:35:10 +0000 (11:35 +0200)
* 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>
33 files changed:
1  2 
libavcodec/bink.c
libavcodec/binkaudio.c
libavcodec/dxtory.c
libavcodec/eatgq.c
libavcodec/eatgv.c
libavcodec/escape124.c
libavcodec/escape130.c
libavcodec/g723_1dec.c
libavcodec/indeo2.c
libavcodec/indeo4.c
libavcodec/interplayvideo.c
libavcodec/ivi.c
libavcodec/metasound.c
libavcodec/msgsmdec.c
libavcodec/nellymoserdec.c
libavcodec/qdm2.c
libavcodec/ra288.c
libavcodec/sipr.c
libavcodec/smacker.c
libavcodec/tak.c
libavcodec/tak.h
libavcodec/tak_parser.c
libavcodec/takdec.c
libavcodec/tiertexseqv.c
libavcodec/tscc2.c
libavcodec/tta.c
libavcodec/vble.c
libavcodec/vorbis.c
libavcodec/vorbisdec.c
libavcodec/wavpack.c
libavcodec/webp.c
libavcodec/xan.c
libavformat/takdec.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 6f283b449f25e2e9731fcc69925075c41e872190,f50bed134e9465544037cc78a71ff973a1d8c415..e9896b5e7af2814c0628b9dc4a16b32ed34510d0
  #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
  
Simple merge
Simple merge
index 88c610d651c122688656520853c8b51574fd5145,e0d1e91992fe25717f967a77c2e4b16450b27c90..aa030152f081e79225b5d2c7a690d254f8966854
  #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
index a1eab941d27df12004431fd40eeefa75b4858aa6,8a5977705a6abc7a590994b95355a70a65e8b759..70f08a8503ace1fbeca13b61385db045b25be21e
  
  #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"
Simple merge
Simple merge
Simple merge
index 074aafdfb2730bd12cd199f689574752b3b63b23,ec57b359ca38ec4383fcc248972af46d3310d9b8..dd8b257f04a7b3e23a089b319251910713860c21
  #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) { \
Simple merge
Simple merge
Simple merge
index ed41ca8a2ee5edadd6336ae0580fd274f44b8742,bd82c3d1939e8a94d869f45f70a50eacb8f4a302..d2670e00ff279db24586426d018ced44c6991c51
   * 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,
  };
Simple merge
Simple merge
index 023bc878e8170c4ebcd21a15849bfb0b9b56c0a7,c9db928c5c0a0f462376b34db2e71b9176c4c666..97732813ec53574ba8fd0b58d82c78bd49a18588
  
  #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 {
Simple merge
Simple merge
index 1e2e9c4ef4c44619cfa6d2e9313146ea818d87d1,2b57406686bcf13f0c00a2dcabe000357d1d56ea..9cb044e991aec48361ae0356d834b0c6a6328f50
   * @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
Simple merge
Simple merge
index 225f1e941430adf62ef0a91e2a918522aa2f8840,8b800fd4398260f2e347fa1abb43f71bfd5c5e2f..0a5eaa68794bc3b7ee9bd8313d0438487c0098cf
  #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"
index b6022f0fa5d80bb5e1d262e08b937e565ac3095c,7f55f515a3adf26cd93ed0f0fabea02c452a67da..071e2be72c5dc4a63850b21c88056c1f01d6ac8a
   * 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
index e715c4b164756399da0e4c83b8a82492b4dfdacb,b26399c504904913daecfc07d22bd698e5068ac7..45abfdc3ca270b985a120868b247f26276345819
   * 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"
  
Simple merge
index 4b4124f9d4899ea8452bf88db03b9a7ab42afa83,b28d44ce007a8ad8d06b19f26a0c5695dee7df8a..a8fb363b34beb6f3fb9aae2197a86ed538b38e06
   * 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;