diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-26 02:31:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-26 02:31:32 +0200 |
| commit | 4ccb7911baa761d373e28068b93db13a76a780b8 (patch) | |
| tree | 56c38b10ad0eb94e94f1b7a56a4ec6ca115945e4 /libavcodec | |
| parent | 5fba761f6e3ff1e3d27fdefe257a9bb31d2cc7ea (diff) | |
| parent | d0ce090ec553c88eb8e9c303156017417d4599cc (diff) | |
| download | ffmpeg-4ccb7911baa761d373e28068b93db13a76a780b8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* 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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/aacpsy.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b6103af3c0..deff279627 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1,5 +1,3 @@ -include $(SUBDIR)../config.mak - NAME = avcodec FFLIBS = avutil diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index baf9388398..f2b525694b 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; |