From 6d97484d72e33f7dde9493a9ead1a72e2f029605 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 13 Mar 2013 21:17:05 +0100 Subject: avcodec: av_log_ask_for_sample() ---> avpriv_request_sample() --- libavcodec/mlpdec.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'libavcodec/mlpdec.c') diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 160f359..5797700 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -329,9 +329,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; } @@ -429,9 +430,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 (s->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", s->max_channel + 2); + avpriv_request_sample(m->avctx, + "%d channels (more than the " + "maximum supported by the decoder)", + s->max_channel + 2); return AVERROR_PATCHWELCOME; } @@ -490,9 +492,9 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, channel); } if (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; @@ -823,8 +825,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) { -- cgit v1.1