From 3a0d0ff5e60a8245f672fedd2aa49fa937aa875a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 24 Jun 2011 10:49:59 +0200 Subject: aacenc: Mark psy_3gpp_window() as av_unused. It is intentionally left in to allow adding 3GPP-style windowing in the future. Marking it av_unused silences an annoying unused function warning. --- libavcodec/aacpsy.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index 5aea1faa40..cf8f7eb914 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -377,9 +377,10 @@ static const uint8_t window_grouping[9] = { * Tell encoder which window types to use. * @see 3GPP TS26.403 5.4.1 "Blockswitching" */ -static FFPsyWindowInfo psy_3gpp_window(FFPsyContext *ctx, - const int16_t *audio, const int16_t *la, - int channel, int prev_type) +static av_unused FFPsyWindowInfo psy_3gpp_window(FFPsyContext *ctx, + const int16_t *audio, + const int16_t *la, + int channel, int prev_type) { int i, j; int br = ctx->avctx->bit_rate / ctx->avctx->channels; -- cgit v1.2.3 From a6213f3dce4006e0d47bd938e15832987d95efef Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 25 Jun 2011 00:19:39 +0200 Subject: build: Remove redundant config.mak includes from subdirectory Makefiles. Calling Make from subdirectories is not supported and config.mak has multiple inclusion guards anyway, so the top-level include is enough. --- libavcodec/Makefile | 2 -- libavdevice/Makefile | 2 -- libavfilter/Makefile | 2 -- libavformat/Makefile | 2 -- libavutil/Makefile | 2 -- libpostproc/Makefile | 2 -- libswscale/Makefile | 2 -- 7 files changed, 14 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0cfa08c1c3..64a286289d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1,5 +1,3 @@ -include $(SUBDIR)../config.mak - NAME = avcodec FFLIBS = avutil diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 5cfc5e8ecc..cbe20d6d57 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -1,5 +1,3 @@ -include $(SUBDIR)../config.mak - NAME = avdevice FFLIBS = avformat avcodec avutil diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 2ed1f937a3..e22527ae49 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -1,5 +1,3 @@ -include $(SUBDIR)../config.mak - NAME = avfilter FFLIBS = avutil FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec diff --git a/libavformat/Makefile b/libavformat/Makefile index c2fa8af466..5041fe0dc9 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -1,5 +1,3 @@ -include $(SUBDIR)../config.mak - NAME = avformat FFLIBS = avcodec avutil diff --git a/libavutil/Makefile b/libavutil/Makefile index 0d8f01dd8d..304b288851 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -1,5 +1,3 @@ -include $(SUBDIR)../config.mak - NAME = avutil HEADERS = adler32.h \ diff --git a/libpostproc/Makefile b/libpostproc/Makefile index bd0b71e3d4..7b359709dc 100644 --- a/libpostproc/Makefile +++ b/libpostproc/Makefile @@ -1,5 +1,3 @@ -include $(SUBDIR)../config.mak - NAME = postproc FFLIBS = avutil diff --git a/libswscale/Makefile b/libswscale/Makefile index 8bb06baae2..b2914113c0 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -1,5 +1,3 @@ -include $(SUBDIR)../config.mak - NAME = swscale FFLIBS = avutil -- cgit v1.2.3 From 89b5829d0a4d9510efeff65dbeeaed50e0980120 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 25 Jun 2011 00:32:12 +0200 Subject: build: Remove multiple inclusion guards from config.mak. config.mak is no longer included multiple times; the guards are pointless. --- configure | 3 --- 1 file changed, 3 deletions(-) diff --git a/configure b/configure index e20bb064a4..41e1a4d2a5 100755 --- a/configure +++ b/configure @@ -3248,8 +3248,6 @@ config_files="$TMPH config.mak" cat > config.mak <> $TMPH -echo "endif # LIBAV_CONFIG_MAK" >> config.mak # Do not overwrite an unchanged config.h to avoid superfluous rebuilds. cp_if_changed $TMPH config.h -- cgit v1.2.3 From 729f953fb5079ca09bbac391b824be454df029d6 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 25 Jun 2011 02:01:12 +0200 Subject: build: Add DEP_LIBS dependency directly to the shared library build rule. The dependency was added conditional to a variable that is always defined, so it is safe to add it directly. --- subdir.mak | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/subdir.mak b/subdir.mak index 63398608d7..e4d7377fcb 100644 --- a/subdir.mak +++ b/subdir.mak @@ -39,15 +39,11 @@ $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) -$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver +$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(DEP_LIBS) $(SLIB_CREATE_DEF_CMD) $$(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS) $(SLIB_EXTRA_CMD) -ifdef SUBDIR -$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS) -endif - clean:: $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ $(foreach dir,$(DIRS),$(CLEANSUFFIXES:%=$(SUBDIR)$(dir)/%)) \ -- cgit v1.2.3 From c713620b4c261e35522fc49394bc9ab5cc4ca27a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 25 Jun 2011 14:09:40 +0200 Subject: ffplay: Remove unused-but-set channels variable from update_sample_display(). --- ffplay.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ffplay.c b/ffplay.c index ffd4c230b8..43cd50c5eb 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1895,9 +1895,7 @@ static int subtitle_thread(void *arg) /* copy samples for viewing in editor window */ static void update_sample_display(VideoState *is, short *samples, int samples_size) { - int size, len, channels; - - channels = is->audio_st->codec->channels; + int size, len; size = samples_size / sizeof(short); while (size > 0) { -- cgit v1.2.3 From d0ce090ec553c88eb8e9c303156017417d4599cc Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sat, 25 Jun 2011 18:51:00 +0100 Subject: ARM: silence some annoying armcc warnings This silences warnings about pointer target sign mismatches as already done for gcc with -Wno-pointer-sign. Signed-off-by: Mans Rullgard --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 41e1a4d2a5..70317178ad 100755 --- a/configure +++ b/configure @@ -3065,6 +3065,8 @@ elif enabled armcc; then add_cflags -W${armcc_opt},--diag_suppress=1207 add_cflags -W${armcc_opt},--diag_suppress=1293 # assignment in condition add_cflags -W${armcc_opt},--diag_suppress=3343 # hardfp compat + add_cflags -W${armcc_opt},--diag_suppress=167 # pointer sign + add_cflags -W${armcc_opt},--diag_suppress=513 # pointer sign elif enabled tms470; then add_cflags -pds=824 -pds=837 elif enabled pathscale; then -- cgit v1.2.3