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
  #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
  #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
  
  #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
  #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
   * 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
  
  #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
   * @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
  #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"
   * 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
   * 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
   * 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;