generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  ARM: silence some annoying armcc warnings
  ffplay: Remove unused-but-set channels variable from update_sample_display().
  build: Add DEP_LIBS dependency directly to the shared library build rule.
  build: Remove multiple inclusion guards from config.mak.
  build: Remove redundant config.mak includes from subdirectory Makefiles.
  aacenc: Mark psy_3gpp_window() as av_unused.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-06-26 02:31:32 +02:00
commit 4ccb7911ba
10 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -3123,6 +3123,8 @@ elif enabled armcc; then
add_cflags -W${armcc_opt},--diag_suppress=1207 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=1293 # assignment in condition
add_cflags -W${armcc_opt},--diag_suppress=3343 # hardfp compat 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 elif enabled tms470; then
add_cflags -pds=824 -pds=837 add_cflags -pds=824 -pds=837
elif enabled pathscale; then elif enabled pathscale; then
@ -3317,8 +3319,6 @@ config_files="$TMPH config.mak"
cat > config.mak <<EOF cat > config.mak <<EOF
# Automatically generated by configure - do not modify! # Automatically generated by configure - do not modify!
ifndef FFMPEG_CONFIG_MAK
FFMPEG_CONFIG_MAK=1
FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION
prefix=$prefix prefix=$prefix
LIBDIR=\$(DESTDIR)$libdir LIBDIR=\$(DESTDIR)$libdir
@ -3461,7 +3461,6 @@ SEEK_TESTS=$(print_enabled -n _test $SEEK_TESTS)
EOF EOF
echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
echo "endif # FFMPEG_CONFIG_MAK" >> config.mak
# Do not overwrite an unchanged config.h to avoid superfluous rebuilds. # Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
cp_if_changed $TMPH config.h cp_if_changed $TMPH config.h

2
libavcodec/Makefile
View File

@ -1,5 +1,3 @@
include $(SUBDIR)../config.mak
NAME = avcodec NAME = avcodec
FFLIBS = avutil FFLIBS = avutil

7
libavcodec/aacpsy.c
View File

@ -377,9 +377,10 @@ static const uint8_t window_grouping[9] = {
* Tell encoder which window types to use. * Tell encoder which window types to use.
* @see 3GPP TS26.403 5.4.1 "Blockswitching" * @see 3GPP TS26.403 5.4.1 "Blockswitching"
*/ */
static FFPsyWindowInfo psy_3gpp_window(FFPsyContext *ctx, static av_unused FFPsyWindowInfo psy_3gpp_window(FFPsyContext *ctx,
const int16_t *audio, const int16_t *la, const int16_t *audio,
int channel, int prev_type) const int16_t *la,
int channel, int prev_type)
{ {
int i, j; int i, j;
int br = ctx->avctx->bit_rate / ctx->avctx->channels; int br = ctx->avctx->bit_rate / ctx->avctx->channels;

2
libavdevice/Makefile
View File

@ -1,5 +1,3 @@
include $(SUBDIR)../config.mak
NAME = avdevice NAME = avdevice
FFLIBS = avformat avcodec avutil FFLIBS = avformat avcodec avutil

2
libavfilter/Makefile
View File

@ -1,5 +1,3 @@
include $(SUBDIR)../config.mak
NAME = avfilter NAME = avfilter
FFLIBS = avutil FFLIBS = avutil
FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec

2
libavformat/Makefile
View File

@ -1,5 +1,3 @@
include $(SUBDIR)../config.mak
NAME = avformat NAME = avformat
FFLIBS = avcodec avutil FFLIBS = avcodec avutil

2
libavutil/Makefile
View File

@ -1,5 +1,3 @@
include $(SUBDIR)../config.mak
NAME = avutil NAME = avutil
HEADERS = adler32.h \ HEADERS = adler32.h \

2
libpostproc/Makefile
View File

@ -1,5 +1,3 @@
include $(SUBDIR)../config.mak
NAME = postproc NAME = postproc
FFLIBS = avutil FFLIBS = avutil

2
libswscale/Makefile
View File

@ -1,5 +1,3 @@
include $(SUBDIR)../config.mak
NAME = swscale NAME = swscale
FFLIBS = avutil FFLIBS = avutil

6
subdir.mak
View File

@ -39,15 +39,11 @@ $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) $(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) $(SLIB_CREATE_DEF_CMD)
$$(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS) $$(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
$(SLIB_EXTRA_CMD) $(SLIB_EXTRA_CMD)
ifdef SUBDIR
$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)
endif
clean:: clean::
$(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
$(foreach dir,$(DIRS),$(CLEANSUFFIXES:%=$(SUBDIR)$(dir)/%)) \ $(foreach dir,$(DIRS),$(CLEANSUFFIXES:%=$(SUBDIR)$(dir)/%)) \