diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:52:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:52:12 +0100 |
| commit | 13795dbb642cecf46e75fb6a78c830bf862c2310 (patch) | |
| tree | 1464c0fd10f716b7c75920cc5b9298ca48251ca8 /libavcodec/mlpdec.c | |
| parent | a9ddb624890dd8c334617239793e63d93fbd52ee (diff) | |
| parent | 6d97484d72e33f7dde9493a9ead1a72e2f029605 (diff) | |
| download | ffmpeg-13795dbb642cecf46e75fb6a78c830bf862c2310.tar.gz | |
Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'
* commit '6d97484d72e33f7dde9493a9ead1a72e2f029605':
avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
rsodec: Use avpriv_report_missing_feature() where appropriate
Conflicts:
libavcodec/anm.c
libavcodec/mlpdec.c
libavcodec/pictordec.c
libavcodec/sunrast.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlpdec.c')
| -rw-r--r-- | libavcodec/mlpdec.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 214ea4570d..a7c79a413d 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -332,9 +332,10 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb) return AVERROR_INVALIDDATA; } if (mh.num_substreams > MAX_SUBSTREAMS) { - av_log_ask_for_sample(m->avctx, - "Number of substreams %d is larger than the maximum supported " - "by the decoder.\n", mh.num_substreams); + avpriv_request_sample(m->avctx, + "%d substreams (more than the " + "maximum supported by the decoder)", + mh.num_substreams); return AVERROR_PATCHWELCOME; } @@ -442,9 +443,10 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, /* This should happen for TrueHD streams with >6 channels and MLP's noise * type. It is not yet known if this is allowed. */ if (max_channel > MAX_MATRIX_CHANNEL_MLP && !s->noise_type) { - av_log_ask_for_sample(m->avctx, - "Number of channels %d is larger than the maximum supported " - "by the decoder.\n", max_channel + 2); + avpriv_request_sample(m->avctx, + "%d channels (more than the " + "maximum supported by the decoder)", + max_channel + 2); return AVERROR_PATCHWELCOME; } @@ -507,9 +509,9 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, channel); } if ((unsigned)ch_assign > s->max_matrix_channel) { - av_log_ask_for_sample(m->avctx, - "Assignment of matrix channel %d to invalid output channel %d.\n", - ch, ch_assign); + avpriv_request_sample(m->avctx, + "Assignment of matrix channel %d to invalid output channel %d", + ch, ch_assign); return AVERROR_PATCHWELCOME; } s->ch_assign[ch_assign] = ch; @@ -855,8 +857,8 @@ static int read_block_data(MLPDecodeContext *m, GetBitContext *gbp, if (s->data_check_present) { expected_stream_pos = get_bits_count(gbp); expected_stream_pos += get_bits(gbp, 16); - av_log_ask_for_sample(m->avctx, "This file contains some features " - "we have not tested yet.\n"); + avpriv_request_sample(m->avctx, + "Substreams with VLC block size check info"); } if (s->blockpos + s->blocksize > m->access_unit_size) { |