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>
Makefile
common.mak
configure
libavformat/pcmdec.c
libavutil/Makefile

index 02e1a13..90dbbd2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ config.h: .config
        @-tput sgr0 2>/dev/null
 
 SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS      \
-               ARCH_HEADERS BUILT_HEADERS SKIPHEADERS                    \
+               HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS            \
                ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS NEON-OBJS             \
                ALTIVEC-OBJS VIS-OBJS                                     \
                MMX-OBJS YASM-OBJS                                        \
index dd5de7a..2d78cf8 100644 (file)
@@ -94,6 +94,7 @@ HOSTPROGS := $(HOSTPROGS:%=$(SUBDIR)%$(HOSTEXESUF))
 TOOLS     += $(TOOLS-yes)
 TOOLOBJS  := $(TOOLS:%=tools/%.o)
 TOOLS     := $(TOOLS:%=tools/%$(EXESUF))
+HEADERS   += $(HEADERS-yes)
 
 DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME))
 
index 2131b21..6556251 100755 (executable)
--- a/configure
+++ b/configure
@@ -2855,12 +2855,12 @@ elif enabled x86; then
 elif enabled sparc; then
 
     case $cpu in
-        niagara)
+        cypress|f93[04]|tsc701|sparcl*|supersparc|hypersparc|niagara|v[789])
             cpuflags="-mcpu=$cpu"
             disable vis
         ;;
-        sparc64)
-            cpuflags="-mcpu=v9"
+        ultrasparc*|niagara[234])
+            cpuflags="-mcpu=$cpu"
         ;;
     esac
 
@@ -3446,9 +3446,7 @@ EOF
 
 elif enabled sparc; then
 
-    enabled vis &&
-        check_inline_asm vis '"pdist %f0, %f0, %f0"' -mcpu=ultrasparc &&
-            add_cflags -mcpu=ultrasparc -mtune=ultrasparc
+    enabled vis && check_inline_asm vis '"pdist %f0, %f0, %f0"'
 
 elif enabled x86; then
 
index 5ed572b..30f69d3 100644 (file)
 
 #define RAW_SAMPLES     1024
 
-typedef struct RawAudioDemuxerContext {
+typedef struct PCMAudioDemuxerContext {
     AVClass *class;
     int sample_rate;
     int channels;
-} RawAudioDemuxerContext;
+} PCMAudioDemuxerContext;
 
-static int raw_read_header(AVFormatContext *s)
+static int pcm_read_header(AVFormatContext *s)
 {
-    RawAudioDemuxerContext *s1 = s->priv_data;
+    PCMAudioDemuxerContext *s1 = s->priv_data;
     AVStream *st;
 
     st = avformat_new_stream(s, NULL);
@@ -61,7 +61,7 @@ static int raw_read_header(AVFormatContext *s)
     return 0;
 }
 
-static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
+static int pcm_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     int ret, size, bps;
     //    AVStream *st = s->streams[0];
@@ -84,8 +84,8 @@ static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
 }
 
 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 = 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 },
 };
 
@@ -99,9 +99,9 @@ static const AVClass name_ ## _demuxer_class = {            \
 AVInputFormat ff_pcm_ ## name_ ## _demuxer = {              \
     .name           = #name_,                               \
     .long_name      = NULL_IF_CONFIG_SMALL(long_name_),     \
-    .priv_data_size = sizeof(RawAudioDemuxerContext),       \
-    .read_header    = raw_read_header,                      \
-    .read_packet    = raw_read_packet,                      \
+    .priv_data_size = sizeof(PCMAudioDemuxerContext),       \
+    .read_header    = pcm_read_header,                      \
+    .read_packet    = pcm_read_packet,                      \
     .read_seek      = ff_pcm_read_seek,                     \
     .flags          = AVFMT_GENERIC_INDEX,                  \
     .extensions     = ext,                                  \
index 2cf0174..20dfba4 100644 (file)
@@ -2,8 +2,6 @@ include $(SUBDIR)../config.mak
 
 NAME = avutil
 
-HEADERS-$(CONFIG_LZO)                   += lzo.h
-
 HEADERS = adler32.h                                                     \
           aes.h                                                         \
           attributes.h                                                  \
@@ -47,7 +45,8 @@ HEADERS = adler32.h                                                     \
           timestamp.h                                                   \
           version.h                                                     \
           xtea.h                                                        \
-          $(HEADERS-yes)                                                \
+
+HEADERS-$(CONFIG_LZO)                   += lzo.h
 
 ARCH_HEADERS = bswap.h                                                  \
                intmath.h                                                \