dilim/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-08-03 22:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

Browse Source 
* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714':
  fate: Declare avcodec/avformat deps in the respective Makefile snippets
  fate: Add dependencies for WMA and WavPack tests
  Improve wording and spelling of av_log_missing_feature messages.
  lavu: remove disabled FF_API_AV_FIFO_PEEK cruft

Conflicts:
	libavcodec/aacsbr.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-10-23 15:00:27 +02:00
parent d0ac26a264 8b8899ac32
commit 35ce42e070
16 changed files with 32 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/aacdec.c
View File

@@ -2789,7 +2789,7 @@ static int read_stream_mux_config(struct LATMContext *latmctx,
// numPrograms
if (get_bits(gb, 4)) { // numPrograms
av_log_missing_feature(latmctx->aac_ctx.avctx,
"multiple programs", 1);
"Multiple programs", 1);
return AVERROR_PATCHWELCOME;
}
@@ -2798,7 +2798,7 @@ static int read_stream_mux_config(struct LATMContext *latmctx,
// for each layer (which there is only one in DVB)
if (get_bits(gb, 3)) { // numLayer
av_log_missing_feature(latmctx->aac_ctx.avctx,
"multiple layers", 1);
"Multiple layers", 1);
return AVERROR_PATCHWELCOME;
}

2
libavcodec/aacsbr.c
View File

@@ -935,7 +935,7 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr,
default:
// some files contain 0-padding
if (bs_extension_id || *num_bits_left > 16 || show_bits(gb, *num_bits_left))
av_log_missing_feature(ac->avctx, "Reserved SBR extensions are", 1);
av_log_missing_feature(ac->avctx, "Reserved SBR extensions", 1);
skip_bits_long(gb, *num_bits_left); // bs_fill_bits
*num_bits_left = 0;
break;

2
libavcodec/eac3dec.c
View File

@@ -321,7 +321,7 @@ int ff_eac3_parse_header(AC3DecodeContext *s)
rates in bit allocation. The best assumption would be that it is
handled like AC-3 DolbyNet, but we cannot be sure until we have a
sample which utilizes this feature. */
av_log_missing_feature(s->avctx, "Reduced sampling rates", 1);
av_log_missing_feature(s->avctx, "Reduced sampling rate", 1);
return AVERROR_PATCHWELCOME;
}
skip_bits(gbc, 5); // skip bitstream id

2
libavcodec/flacdec.c
View File

@@ -369,7 +369,7 @@ static inline int decode_subframe(FLACContext *s, int channel)
bps -= wasted;
}
if (bps > 32) {
av_log_missing_feature(s->avctx, "decorrelated bit depth > 32", 0);
av_log_missing_feature(s->avctx, "Decorrelated bit depth > 32", 0);
return AVERROR_PATCHWELCOME;
}

2
libavcodec/flashsv.c
View File

@@ -266,7 +266,7 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_PATCHWELCOME;
}
if (get_bits1(&gb)) {
av_log_missing_feature(avctx, "custom palette", 1);
av_log_missing_feature(avctx, "Custom palette", 1);
return AVERROR_PATCHWELCOME;
}
}

2
libavcodec/proresdec_lgpl.c
View File

@@ -171,7 +171,7 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
ctx->alpha_info = buf[17] & 0xf;
if (ctx->alpha_info)
av_log_missing_feature(avctx, "alpha channel", 0);
av_log_missing_feature(avctx, "Alpha channel", 0);
ctx->qmat_changed = 0;
ptr = buf + 20;

4
libavcodec/wmalosslessdec.c
View File

@@ -189,7 +189,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
else if (s->bits_per_sample == 24) {
avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
av_log_missing_feature(avctx, "bit-depth higher than 16", 0);
av_log_missing_feature(avctx, "Bit-depth higher than 16", 0);
return AVERROR_PATCHWELCOME;
} else {
av_log(avctx, AV_LOG_ERROR, "Unknown bit-depth: %d\n",
@@ -885,7 +885,7 @@ static int decode_subframe(WmallDecodeCtx *s)
s->do_arith_coding = get_bits1(&s->gb);
if (s->do_arith_coding) {
av_log_missing_feature(s->avctx, "arithmetic coding", 1);
av_log_missing_feature(s->avctx, "Arithmetic coding", 1);
return AVERROR_PATCHWELCOME;
}
s->do_ac_filter = get_bits1(&s->gb);