diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | common.mak | 1 | ||||
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | libavformat/pcmdec.c | 20 | ||||
| -rw-r--r-- | libavutil/Makefile | 5 |
5 files changed, 18 insertions, 20 deletions
@@ -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 \ diff --git a/common.mak b/common.mak index dd5de7a508..2d78cf8fb2 100644 --- a/common.mak +++ b/common.mak @@ -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)) @@ -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 diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c index 5ed572b8f7..30f69d3ff0 100644 --- a/libavformat/pcmdec.c +++ b/libavformat/pcmdec.c @@ -28,15 +28,15 @@ #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, \ diff --git a/libavutil/Makefile b/libavutil/Makefile index 2cf0174697..20dfba407a 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -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 \ |