Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Oct 2012 12:55:15 +0000 (14:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Oct 2012 13:20:48 +0000 (15:20 +0200)
* qatar/master:
  configure: sanitise sparc vis check
  configure: recognise more sparc variants as --cpu argument
  build: Include HEADERS-yes in the HEADERS variable
  pcm: change references to raw to pcm
  ffv1: set the range coder state in decode_slice_header
  pcmdec: change default of channels parameter to 1

Conflicts:
libavformat/pcmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
Makefile
common.mak
configure
libavformat/pcmdec.c
libavutil/Makefile

diff --cc Makefile
Simple merge
diff --cc common.mak
Simple merge
diff --cc configure
Simple merge
@@@ -84,8 -82,8 +84,8 @@@ static int pcm_read_packet(AVFormatCont
  }
  
  static const AVOption pcm_options[] = {
-     { "sample_rate", "", offsetof(RawAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 44100}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
-     { "channels",    "", offsetof(RawAudioDemuxerContext, channels),    AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
 -    { "sample_rate", "", offsetof(PCMAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
++    { "sample_rate", "", offsetof(PCMAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 44100}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
+     { "channels",    "", offsetof(PCMAudioDemuxerContext, channels),    AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
      { NULL },
  };
  
@@@ -1,9 -1,5 +1,7 @@@
 +include $(SUBDIR)../config.mak
 +
  NAME = avutil
  
- HEADERS-$(CONFIG_LZO)                   += lzo.h
  HEADERS = adler32.h                                                     \
            aes.h                                                         \
            attributes.h                                                  \
            samplefmt.h                                                   \
            sha.h                                                         \
            time.h                                                        \
 +          timecode.h                                                    \
 +          timestamp.h                                                   \
            version.h                                                     \
            xtea.h                                                        \
-           $(HEADERS-yes)                                                \
+ HEADERS-$(CONFIG_LZO)                   += lzo.h
  
  ARCH_HEADERS = bswap.h                                                  \
                 intmath.h                                                \