---
libavcodec/aacdec.c | 16 ++++++++--------
libavcodec/adx.c | 2 +-
libavcodec/alac.c | 4 ++--
libavcodec/anm.c | 6 +++---
libavcodec/ansi.c | 6 +++---
libavcodec/apedec.c | 5 +++--
libavcodec/atrac3.c | 2 +-
libavcodec/cdxl.c | 7 ++++---
libavcodec/cinepak.c | 2 +-
libavcodec/cook.c | 18 +++++++++---------
libavcodec/dcadec.c | 4 ++--
libavcodec/dxtory.c | 2 +-
libavcodec/h264.c | 2 +-
libavcodec/imc.c | 4 ++--
libavcodec/indeo3.c | 4 ++--
libavcodec/indeo4.c | 4 ++--
libavcodec/loco.c | 2 +-
libavcodec/mlpdec.c | 24 +++++++++++++-----------
libavcodec/mpc7.c | 4 ++--
libavcodec/mss2.c | 4 ++--
libavcodec/pictordec.c | 4 ++--
libavcodec/ptx.c | 4 ++--
libavcodec/qcelpdec.c | 2 +-
libavcodec/ralf.c | 2 +-
libavcodec/sunrast.c | 4 ++--
libavcodec/truemotion1.c | 4 ++--
libavcodec/truespeech.c | 2 +-
libavcodec/utvideodec.c | 4 ++--
libavcodec/v210x.c | 2 +-
libavcodec/vc1dec.c | 2 +-
libavcodec/vorbis_parser.c | 6 +++---
libavcodec/wmalosslessdec.c | 10 +++++-----
libavcodec/wmaprodec.c | 20 ++++++++++----------
libavcodec/wnv1.c | 10 ++++++----
libavcodec/xwddec.c | 6 ++++--
libavcodec/zmbv.c | 18 ++++++++++--------
libavformat/anm.c | 4 ++--
libavformat/au.c | 4 ++--
libavformat/bethsoftvid.c | 4 ++--
libavformat/filmstripdec.c | 2 +-
libavformat/mov.c | 2 +-
libavformat/mpegts.c | 2 +-
libavformat/mtv.c | 2 +-
libavformat/mxfdec.c | 15 ++++++++-------
libavformat/omadec.c | 4 ++--
libavformat/rsodec.c | 2 +-
libavformat/smjpegdec.c | 6 +++---
libavformat/spdifdec.c | 2 +-
libavformat/spdifenc.c | 4 ++--
libavformat/westwood_aud.c | 4 ++--
libavformat/xmv.c | 2 +-
libavformat/xwma.c | 4 ++--
52 files changed, 148 insertions(+), 137 deletions(-)
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 1c4b41d..04cb487 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -1114,10 +1114,10 @@ static int decode_scalefactors(AACContext *ac, float
sf[120], GetBitContext *gb,
offset[2] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) -
60;
clipped_offset = av_clip(offset[2], -155, 100);
if (offset[2] != clipped_offset) {
- av_log_ask_for_sample(ac->avctx, "Intensity stereo "
- "position clipped (%d -> %d).\nIf you heard an
"
- "audible artifact, there may be a bug in the "
- "decoder. ", offset[2], clipped_offset);
+ avpriv_log_ask_for_sample(ac->avctx,
+ "Intensity stereo position
clipped (%d -> %d).\n"
+ "If you heard an audible
artifact, there may be a bug in the decoder. ",
+ offset[2], clipped_offset);
}
sf[idx] = ff_aac_pow2sf_tab[-clipped_offset +
POW_SF2_ZERO];
}
@@ -1129,10 +1129,10 @@ static int decode_scalefactors(AACContext *ac, float
sf[120], GetBitContext *gb,
offset[1] += get_vlc2(gb, vlc_scalefactors.table, 7,
3) - 60;
clipped_offset = av_clip(offset[1], -100, 155);
if (offset[1] != clipped_offset) {
- av_log_ask_for_sample(ac->avctx, "Noise gain clipped "
- "(%d -> %d).\nIf you heard an audible "
- "artifact, there may be a bug in the decoder.
",
- offset[1], clipped_offset);
+ avpriv_log_ask_for_sample(ac->avctx,
+ "Noise gain clipped (%d ->
%d).\n"
+ "If you heard an audible
artifact, there may be a bug in the decoder. ",
+ offset[1], clipped_offset);
}
sf[idx] = -ff_aac_pow2sf_tab[clipped_offset +
POW_SF2_ZERO];
}
diff --git a/libavcodec/adx.c b/libavcodec/adx.c
index 870216c..c8f0d33 100644
--- a/libavcodec/adx.c
+++ b/libavcodec/adx.c
@@ -53,7 +53,7 @@ int avpriv_adx_decode_header(AVCodecContext *avctx, const
uint8_t *buf,
/* check for encoding=3 block_size=18, sample_size=4 */
if (buf[4] != 3 || buf[5] != 18 || buf[6] != 4) {
- av_log_ask_for_sample(avctx, "unsupported ADX format\n");
+ avpriv_log_ask_for_sample(avctx, "unsupported ADX format\n");
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 0c5bdd3..bdc405b 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -535,8 +535,8 @@ static av_cold int alac_decode_init(AVCodecContext * avctx)
case 24:
case 32: avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
break;
- default: av_log_ask_for_sample(avctx, "Sample depth %d is not
supported.\n",
- alac->sample_size);
+ default: avpriv_log_ask_for_sample(avctx, "Sample depth %d is not
supported.\n",
+ alac->sample_size);
return AVERROR_PATCHWELCOME;
}
avctx->bits_per_raw_sample = alac->sample_size;
diff --git a/libavcodec/anm.c b/libavcodec/anm.c
index af148a6..d3c4c76 100644
--- a/libavcodec/anm.c
+++ b/libavcodec/anm.c
@@ -123,11 +123,11 @@ static int decode_frame(AVCodecContext *avctx,
bytestream2_init(&s->gb, avpkt->data, buf_size);
if (bytestream2_get_byte(&s->gb) != 0x42) {
- av_log_ask_for_sample(avctx, "unknown record type\n");
+ avpriv_log_ask_for_sample(avctx, "unknown record type\n");
return buf_size;
}
if (bytestream2_get_byte(&s->gb)) {
- av_log_ask_for_sample(avctx, "padding bytes not supported\n");
+ avpriv_log_ask_for_sample(avctx, "padding bytes not supported\n");
return buf_size;
}
bytestream2_skip(&s->gb, 2);
@@ -157,7 +157,7 @@ static int decode_frame(AVCodecContext *avctx,
if (type == 0)
break; // stop
if (type == 2) {
- av_log_ask_for_sample(avctx, "unknown opcode");
+ avpriv_log_ask_for_sample(avctx, "unknown opcode");
return AVERROR_PATCHWELCOME;
}
continue;
diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c
index 0b2e93d..0af8b1b 100644
--- a/libavcodec/ansi.c
+++ b/libavcodec/ansi.c
@@ -217,7 +217,7 @@ static int execute_code(AVCodecContext * avctx, int c)
height = 60<<4;
break;
default:
- av_log_ask_for_sample(avctx, "unsupported screen mode\n");
+ avpriv_log_ask_for_sample(avctx, "unsupported screen mode\n");
}
if (width != avctx->width || height != avctx->height) {
if (s->frame.data[0])
@@ -287,7 +287,7 @@ static int execute_code(AVCodecContext * avctx, int c)
} else if (m == 49) {
s->fg = ansi_to_cga[DEFAULT_BG_COLOR];
} else {
- av_log_ask_for_sample(avctx, "unsupported rendition
parameter\n");
+ avpriv_log_ask_for_sample(avctx, "unsupported rendition
parameter\n");
}
}
break;
@@ -304,7 +304,7 @@ static int execute_code(AVCodecContext * avctx, int c)
s->y = av_clip(s->sy, 0, avctx->height - s->font_height);
break;
default:
- av_log_ask_for_sample(avctx, "unsupported escape code\n");
+ avpriv_log_ask_for_sample(avctx, "unsupported escape code\n");
break;
}
return 0;
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index f363583..c914eba 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -205,8 +205,9 @@ static av_cold int ape_decode_init(AVCodecContext *avctx)
avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
break;
default:
- av_log_ask_for_sample(avctx, "Unsupported bits per coded sample %d\n",
- s->bps);
+ avpriv_log_ask_for_sample(avctx,
+ "Unsupported bits per coded sample %d\n",
+ s->bps);
return AVERROR_PATCHWELCOME;
}
s->avctx = avctx;
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 0474268..d996b0d 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -169,7 +169,7 @@ static int decode_bytes(const uint8_t *input, uint8_t *out,
int bytes)
output[i] = c ^ buf[i];
if (off)
- av_log_ask_for_sample(NULL, "Offset of %d not handled.\n", off);
+ avpriv_log_ask_for_sample(NULL, "Offset of %d not handled.\n", off);
return off;
}
diff --git a/libavcodec/cdxl.c b/libavcodec/cdxl.c
index 0b3d59c..18288ca 100644
--- a/libavcodec/cdxl.c
+++ b/libavcodec/cdxl.c
@@ -234,7 +234,8 @@ static int cdxl_decode_frame(AVCodecContext *avctx, void
*data,
if (c->bpp < 1)
return AVERROR_INVALIDDATA;
if (c->format != BIT_PLANAR && c->format != BIT_LINE) {
- av_log_ask_for_sample(avctx, "unsupported pixel format: 0x%0x\n",
c->format);
+ avpriv_log_ask_for_sample(avctx, "unsupported pixel format: 0x%0x\n",
+ c->format);
return AVERROR_PATCHWELCOME;
}
@@ -254,8 +255,8 @@ static int cdxl_decode_frame(AVCodecContext *avctx, void
*data,
return AVERROR_INVALIDDATA;
avctx->pix_fmt = AV_PIX_FMT_BGR24;
} else {
- av_log_ask_for_sample(avctx, "unsupported encoding %d and bpp %d\n",
- encoding, c->bpp);
+ avpriv_log_ask_for_sample(avctx, "unsupported encoding %d and bpp
%d\n",
+ encoding, c->bpp);
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 9bf6863..465fa94 100644
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -333,7 +333,7 @@ static int cinepak_decode (CinepakContext *s)
/* if this is the first frame, check for deviant Sega FILM data */
if (s->sega_film_skip_bytes == -1) {
if (!encoded_buf_size) {
- av_log_ask_for_sample(s->avctx, "encoded_buf_size is 0");
+ avpriv_log_ask_for_sample(s->avctx, "encoded_buf_size is 0");
return AVERROR_PATCHWELCOME;
}
if (encoded_buf_size != s->size && (s->size % encoded_buf_size) != 0) {
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index ba542c2..6e26870 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -1100,7 +1100,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
switch (q->subpacket[s].cookversion) {
case MONO:
if (avctx->channels != 1) {
- av_log_ask_for_sample(avctx, "Container channels != 1.\n");
+ avpriv_log_ask_for_sample(avctx, "Container channels != 1.\n");
return AVERROR_PATCHWELCOME;
}
av_log(avctx, AV_LOG_DEBUG, "MONO\n");
@@ -1114,7 +1114,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
break;
case JOINT_STEREO:
if (avctx->channels != 2) {
- av_log_ask_for_sample(avctx, "Container channels != 2.\n");
+ avpriv_log_ask_for_sample(avctx, "Container channels != 2.\n");
return AVERROR_PATCHWELCOME;
}
av_log(avctx, AV_LOG_DEBUG, "JOINT_STEREO\n");
@@ -1154,7 +1154,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
break;
default:
- av_log_ask_for_sample(avctx, "Unknown Cook version.\n");
+ avpriv_log_ask_for_sample(avctx, "Unknown Cook version.\n");
return AVERROR_PATCHWELCOME;
}
@@ -1170,7 +1170,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
/* Try to catch some obviously faulty streams, othervise it might be
exploitable */
if (q->subpacket[s].total_subbands > 53) {
- av_log_ask_for_sample(avctx, "total_subbands > 53\n");
+ avpriv_log_ask_for_sample(avctx, "total_subbands > 53\n");
return AVERROR_PATCHWELCOME;
}
@@ -1182,7 +1182,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
}
if (q->subpacket[s].subbands > 50) {
- av_log_ask_for_sample(avctx, "subbands > 50\n");
+ avpriv_log_ask_for_sample(avctx, "subbands > 50\n");
return AVERROR_PATCHWELCOME;
}
q->subpacket[s].gains1.now = q->subpacket[s].gain_1;
@@ -1193,7 +1193,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
q->num_subpackets++;
s++;
if (s > MAX_SUBPACKETS) {
- av_log_ask_for_sample(avctx, "Too many subpackets > 5\n");
+ avpriv_log_ask_for_sample(avctx, "Too many subpackets > 5\n");
return AVERROR_PATCHWELCOME;
}
}
@@ -1235,9 +1235,9 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
/* Try to catch some obviously faulty streams, othervise it might be
exploitable */
if (q->samples_per_channel != 256 && q->samples_per_channel != 512 &&
q->samples_per_channel != 1024) {
- av_log_ask_for_sample(avctx,
- "unknown amount of samples_per_channel = %d\n",
- q->samples_per_channel);
+ avpriv_log_ask_for_sample(avctx,
+ "unknown amount of samples_per_channel =
%d\n",
+ q->samples_per_channel);
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index efd0705..3782f4d 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -1598,14 +1598,14 @@ static void dca_exss_parse_header(DCAContext *s)
num_audiop = get_bits(&s->gb, 3) + 1;
if (num_audiop > 1) {
- av_log_ask_for_sample(s->avctx, "Multiple DTS-HD audio
presentations.");
+ avpriv_log_ask_for_sample(s->avctx, "Multiple DTS-HD audio
presentations.");
/* ignore such streams for now */
return;
}
num_assets = get_bits(&s->gb, 3) + 1;
if (num_assets > 1) {
- av_log_ask_for_sample(s->avctx, "Multiple DTS-HD audio assets.");
+ avpriv_log_ask_for_sample(s->avctx, "Multiple DTS-HD audio
assets.");
/* ignore such streams for now */
return;
}
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index 30983f8..cd0f367 100644
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -60,7 +60,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
int *got_frame,
pic->key_frame = 1;
if (AV_RL32(src) != 0x01000002) {
- av_log_ask_for_sample(avctx, "Unknown frame header %X\n",
AV_RL32(src));
+ avpriv_log_ask_for_sample(avctx, "Unknown frame header %X\n",
AV_RL32(src));
return AVERROR_PATCHWELCOME;
}
src += 16;
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index a20a6f7..11d681f 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3223,7 +3223,7 @@ static int decode_slice_header(H264Context *h,
H264Context *h0)
} else if (last_pic_droppable != h->droppable) {
av_log(h->avctx, AV_LOG_ERROR,
"Cannot combine reference and non-reference
fields in the same frame\n");
- av_log_ask_for_sample(h->avctx, NULL);
+ avpriv_log_ask_for_sample(h->avctx, NULL);
h->picture_structure = last_pic_structure;
h->droppable = last_pic_droppable;
return AVERROR_PATCHWELCOME;
diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index 9b984c1..a325200 100644
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -181,7 +181,7 @@ static av_cold int imc_decode_init(AVCodecContext *avctx)
avctx->channels = 1;
if (avctx->channels > 2) {
- av_log_ask_for_sample(avctx, "Number of channels is not supported\n");
+ avpriv_log_ask_for_sample(avctx, "Number of channels is not
supported\n");
return AVERROR_PATCHWELCOME;
}
@@ -778,7 +778,7 @@ static int imc_decode_block(AVCodecContext *avctx,
IMCContext *q, int ch)
stream_format_code = get_bits(&q->gb, 3);
if (stream_format_code & 1) {
- av_log_ask_for_sample(avctx, "Stream format %X is not supported\n",
+ avpriv_log_ask_for_sample(avctx, "Stream format %X is not supported\n",
stream_format_code);
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index 22f5e79..8ab8743 100644
--- a/libavcodec/indeo3.c
+++ b/libavcodec/indeo3.c
@@ -961,12 +961,12 @@ static int decode_frame_headers(Indeo3DecodeContext *ctx,
AVCodecContext *avctx,
}
if (ctx->frame_flags & BS_8BIT_PEL) {
- av_log_ask_for_sample(avctx, "8-bit pixel format\n");
+ avpriv_log_ask_for_sample(avctx, "8-bit pixel format\n");
return AVERROR_PATCHWELCOME;
}
if (ctx->frame_flags & BS_MV_X_HALF || ctx->frame_flags & BS_MV_Y_HALF) {
- av_log_ask_for_sample(avctx, "halfpel motion vectors\n");
+ avpriv_log_ask_for_sample(avctx, "halfpel motion vectors\n");
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index 07fbc8e..add7da5 100644
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -329,12 +329,12 @@ static int decode_band_hdr(IVI45DecContext *ctx,
IVIBandDesc *band,
transform_id = get_bits(&ctx->gb, 5);
if (transform_id >= FF_ARRAY_ELEMS(transforms) ||
!transforms[transform_id].inv_trans) {
- av_log_ask_for_sample(avctx, "Unimplemented transform: %d!\n",
transform_id);
+ avpriv_log_ask_for_sample(avctx, "Unimplemented transform:
%d!\n", transform_id);
return AVERROR_PATCHWELCOME;
}
if ((transform_id >= 7 && transform_id <= 9) ||
transform_id == 17) {
- av_log_ask_for_sample(avctx, "DCT transform not supported
yet!\n");
+ avpriv_log_ask_for_sample(avctx, "DCT transform not supported
yet!\n");
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/loco.c b/libavcodec/loco.c
index b1ad41a..42cdec2 100644
--- a/libavcodec/loco.c
+++ b/libavcodec/loco.c
@@ -289,7 +289,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
break;
default:
l->lossy = AV_RL32(avctx->extradata + 8);
- av_log_ask_for_sample(avctx, "This is LOCO codec version %i.\n",
version);
+ avpriv_log_ask_for_sample(avctx, "This is LOCO codec version %i.\n",
version);
}
l->mode = AV_RL32(avctx->extradata + 4);
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index 130ce26..b745a43 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_log_ask_for_sample(m->avctx,
+ "Number of substreams %d is larger than the "
+ "maximum supported by the decoder.\n",
+ 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_log_ask_for_sample(m->avctx,
+ "Number of channels %d is larger than the "
+ "maximum supported by the decoder.\n",
+ 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_log_ask_for_sample(m->avctx,
+ "Assignment of matrix channel %d to
invalid output channel %d.\n",
+ 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_log_ask_for_sample(m->avctx, "This file contains some features "
+ "we have not tested yet.\n");
}
if (s->blockpos + s->blocksize > m->access_unit_size) {
diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c
index f151f9c3..fb0134e 100644
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@@ -65,8 +65,8 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx)
/* Musepack SV7 is always stereo */
if (avctx->channels != 2) {
- av_log_ask_for_sample(avctx, "Unsupported number of channels: %d\n",
- avctx->channels);
+ avpriv_log_ask_for_sample(avctx, "Unsupported number of channels:
%d\n",
+ avctx->channels);
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c
index 006432b..01c1218 100644
--- a/libavcodec/mss2.c
+++ b/libavcodec/mss2.c
@@ -430,8 +430,8 @@ static int decode_wmv9(AVCodecContext *avctx, const uint8_t
*buf, int buf_size,
ctx->dsp.upsample_plane(f->data[1], f->linesize[1], w >> 1, h >> 1);
ctx->dsp.upsample_plane(f->data[2], f->linesize[2], w >> 1, h >> 1);
} else if (v->respic)
- av_log_ask_for_sample(v->s.avctx,
- "Asymmetric WMV9 rectangle subsampling\n");
+ avpriv_log_ask_for_sample(v->s.avctx,
+ "Asymmetric WMV9 rectangle subsampling\n");
av_assert0(f->linesize[1] == f->linesize[2]);
diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c
index 16f9307..14067ca 100644
--- a/libavcodec/pictordec.c
+++ b/libavcodec/pictordec.c
@@ -122,7 +122,7 @@ static int decode_frame(AVCodecContext *avctx,
s->nb_planes = (tmp >> 4) + 1;
bpp = bits_per_plane * s->nb_planes;
if (bits_per_plane > 8 || bpp < 1 || bpp > 32) {
- av_log_ask_for_sample(s, "unsupported bit depth\n");
+ avpriv_log_ask_for_sample(s, "unsupported bit depth\n");
return AVERROR_PATCHWELCOME;
}
@@ -234,7 +234,7 @@ static int decode_frame(AVCodecContext *avctx,
}
}
} else {
- av_log_ask_for_sample(s, "uncompressed image\n");
+ avpriv_log_ask_for_sample(s, "uncompressed image\n");
return avpkt->size;
}
diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c
index e8f8bdd..8b1e2da 100644
--- a/libavcodec/ptx.c
+++ b/libavcodec/ptx.c
@@ -57,7 +57,7 @@ static int ptx_decode_frame(AVCodecContext *avctx, void
*data, int *got_frame,
bytes_per_pixel = AV_RL16(buf+12) >> 3;
if (bytes_per_pixel != 2) {
- av_log_ask_for_sample(avctx, "Image format is not RGB15.\n");
+ avpriv_log_ask_for_sample(avctx, "Image format is not RGB15.\n");
return AVERROR_PATCHWELCOME;
}
@@ -66,7 +66,7 @@ static int ptx_decode_frame(AVCodecContext *avctx, void
*data, int *got_frame,
if (buf_end - buf < offset)
return AVERROR_INVALIDDATA;
if (offset != 0x2c)
- av_log_ask_for_sample(avctx, "offset != 0x2c\n");
+ avpriv_log_ask_for_sample(avctx, "offset != 0x2c\n");
buf += offset;
diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c
index 9c7855d..5e8d036 100644
--- a/libavcodec/qcelpdec.c
+++ b/libavcodec/qcelpdec.c
@@ -636,7 +636,7 @@ static qcelp_packet_rate determine_bitrate(AVCodecContext
*avctx,
if (bitrate == SILENCE) {
//FIXME: Remove experimental warning when tested with samples.
- av_log_ask_for_sample(avctx, "'Blank frame handling is experimental.");
+ avpriv_log_ask_for_sample(avctx, "'Blank frame handling is
experimental.");
}
return bitrate;
}
diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c
index b163a89..077dd6b 100644
--- a/libavcodec/ralf.c
+++ b/libavcodec/ralf.c
@@ -136,7 +136,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
ctx->version = AV_RB16(avctx->extradata + 4);
if (ctx->version != 0x103) {
- av_log_ask_for_sample(avctx, "unknown version %X\n", ctx->version);
+ avpriv_log_ask_for_sample(avctx, "unknown version %X\n", ctx->version);
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c
index a44cdf0..81d5d3a 100644
--- a/libavcodec/sunrast.c
+++ b/libavcodec/sunrast.c
@@ -69,7 +69,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void
*data,
buf += 32;
if (type == RT_FORMAT_TIFF || type == RT_FORMAT_IFF || type ==
RT_EXPERIMENTAL) {
- av_log_ask_for_sample(avctx, "unsupported (compression) type\n");
+ avpriv_log_ask_for_sample(avctx, "unsupported (compression) type\n");
return AVERROR_PATCHWELCOME;
}
if (type > RT_FORMAT_IFF) {
@@ -81,7 +81,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void
*data,
return AVERROR_INVALIDDATA;
}
if (maptype == RMT_RAW) {
- av_log_ask_for_sample(avctx, "unsupported colormap type\n");
+ avpriv_log_ask_for_sample(avctx, "unsupported colormap type\n");
return AVERROR_PATCHWELCOME;
}
if (maptype > RMT_RAW) {
diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c
index 73f7056..c99268c 100644
--- a/libavcodec/truemotion1.c
+++ b/libavcodec/truemotion1.c
@@ -354,7 +354,7 @@ static int truemotion1_decode_header(TrueMotion1Context *s)
s->flags = FLAG_KEYFRAME;
if (s->flags & FLAG_SPRITE) {
- av_log_ask_for_sample(s->avctx, "SPRITE frame found.\n");
+ avpriv_log_ask_for_sample(s->avctx, "SPRITE frame found.\n");
/* FIXME header.width, height, xoffset and yoffset aren't initialized
*/
return AVERROR_PATCHWELCOME;
} else {
@@ -364,7 +364,7 @@ static int truemotion1_decode_header(TrueMotion1Context *s)
if ((s->w < 213) && (s->h >= 176))
{
s->flags |= FLAG_INTERPOLATED;
- av_log_ask_for_sample(s->avctx, "INTERPOLATION selected.\n");
+ avpriv_log_ask_for_sample(s->avctx, "INTERPOLATION
selected.\n");
}
}
}
diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c
index 73f2de9..2a5c2f0 100644
--- a/libavcodec/truespeech.c
+++ b/libavcodec/truespeech.c
@@ -63,7 +63,7 @@ static av_cold int truespeech_decode_init(AVCodecContext *
avctx)
TSContext *c = avctx->priv_data;
if (avctx->channels != 1) {
- av_log_ask_for_sample(avctx, "Unsupported channel count: %d\n",
avctx->channels);
+ avpriv_log_ask_for_sample(avctx, "Unsupported channel count: %d\n",
avctx->channels);
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c
index 3f8f690..0028e33 100644
--- a/libavcodec/utvideodec.c
+++ b/libavcodec/utvideodec.c
@@ -380,7 +380,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
int *got_frame,
c->frame_pred = (c->frame_info >> 8) & 3;
if (c->frame_pred == PRED_GRADIENT) {
- av_log_ask_for_sample(avctx, "Frame uses gradient prediction\n");
+ avpriv_log_ask_for_sample(avctx, "Frame uses gradient prediction\n");
return AVERROR_PATCHWELCOME;
}
@@ -496,7 +496,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
c->flags = AV_RL32(avctx->extradata + 12);
if (c->frame_info_size != 4)
- av_log_ask_for_sample(avctx, "Frame info is not 4 bytes\n");
+ avpriv_log_ask_for_sample(avctx, "Frame info is not 4 bytes\n");
av_log(avctx, AV_LOG_DEBUG, "Encoding parameters %08X\n", c->flags);
c->slices = (c->flags >> 24) + 1;
c->compression = c->flags & 1;
diff --git a/libavcodec/v210x.c b/libavcodec/v210x.c
index 97938b1..1bb8844 100644
--- a/libavcodec/v210x.c
+++ b/libavcodec/v210x.c
@@ -57,7 +57,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
int *got_frame,
}
if (avpkt->size > avctx->width * avctx->height * 8 / 3) {
- av_log_ask_for_sample(avctx, "Probably padded data\n");
+ avpriv_log_ask_for_sample(avctx, "Probably padded data\n");
}
pic->reference = 0;
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 403bac8..ccf17e5 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -4849,7 +4849,7 @@ static void vc1_parse_sprites(VC1Context *v,
GetBitContext* gb, SpriteData* sd)
for (sprite = 0; sprite <= v->two_sprites; sprite++) {
vc1_sprite_parse_transform(gb, sd->coefs[sprite]);
if (sd->coefs[sprite][1] || sd->coefs[sprite][3])
- av_log_ask_for_sample(avctx, "Rotation coefficients are not zero");
+ avpriv_log_ask_for_sample(avctx, "Rotation coefficients are not
zero");
av_log(avctx, AV_LOG_DEBUG, sprite ? "S2:" : "S1:");
for (i = 0; i < 7; i++)
av_log(avctx, AV_LOG_DEBUG, " %d.%.3d",
diff --git a/libavcodec/vorbis_parser.c b/libavcodec/vorbis_parser.c
index c6d300d..f5c240e 100644
--- a/libavcodec/vorbis_parser.c
+++ b/libavcodec/vorbis_parser.c
@@ -141,9 +141,9 @@ static int parse_setup_header(AVCodecContext *avctx,
VorbisParseContext *s,
* we may need to approach this the long way and parse the whole Setup
* header, but I hope very much that it never comes to that. */
if (last_mode_count > 2) {
- av_log_ask_for_sample(avctx, "%d modes found. This is either a false "
- "positive or a sample from an unknown
encoder.\n",
- last_mode_count);
+ avpriv_log_ask_for_sample(avctx, "%d modes found. This is either a
false "
+ "positive or a sample from an unknown
encoder.\n",
+ last_mode_count);
}
/* We're limiting the mode count to 63 so that we know that the previous
* block flag will be in the first packet byte. */
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index b6a58db..451fe17 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -202,7 +202,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
av_dlog(avctx, "\n");
} else {
- av_log_ask_for_sample(avctx, "Unsupported extradata size\n");
+ avpriv_log_ask_for_sample(avctx, "Unsupported extradata size\n");
return AVERROR_PATCHWELCOME;
}
@@ -256,7 +256,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
s->num_channels);
return AVERROR_INVALIDDATA;
} else if (s->num_channels > WMALL_MAX_CHANNELS) {
- av_log_ask_for_sample(avctx, "unsupported number of channels\n");
+ avpriv_log_ask_for_sample(avctx, "unsupported number of channels\n");
return AVERROR_PATCHWELCOME;
}
@@ -925,8 +925,8 @@ static int decode_subframe(WmallDecodeCtx *s)
s->do_lpc = get_bits1(&s->gb);
if (s->do_lpc) {
decode_lpc(s);
- av_log_ask_for_sample(s->avctx, "Inverse LPC filter not "
- "implemented. Expect wrong output.\n");
+ avpriv_log_ask_for_sample(s->avctx, "Inverse LPC filter not "
+ "implemented. Expect wrong
output.\n");
}
} else
s->do_lpc = 0;
@@ -1137,7 +1137,7 @@ static void save_bits(WmallDecodeCtx *s, GetBitContext*
gb, int len,
buflen = (s->num_saved_bits + len + 8) >> 3;
if (len <= 0 || buflen > MAX_FRAMESIZE) {
- av_log_ask_for_sample(s->avctx, "input buffer too small\n");
+ avpriv_log_ask_for_sample(s->avctx, "input buffer too small\n");
s->packet_loss = 1;
return;
}
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index e25ee14..7f0fdb2 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -294,7 +294,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
av_dlog(avctx, "\n");
} else {
- av_log_ask_for_sample(avctx, "Unknown extradata size\n");
+ avpriv_log_ask_for_sample(avctx, "Unknown extradata size\n");
return AVERROR_PATCHWELCOME;
}
@@ -341,7 +341,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->channels);
return AVERROR_INVALIDDATA;
} else if (avctx->channels > WMAPRO_MAX_CHANNELS) {
- av_log_ask_for_sample(avctx, "unsupported number of channels\n");
+ avpriv_log_ask_for_sample(avctx, "unsupported number of channels\n");
return AVERROR_PATCHWELCOME;
}
@@ -671,8 +671,8 @@ static int decode_channel_transform(WMAProDecodeCtx* s)
int remaining_channels = s->channels_for_cur_subframe;
if (get_bits1(&s->gb)) {
- av_log_ask_for_sample(s->avctx,
- "unsupported channel transform bit\n");
+ avpriv_log_ask_for_sample(s->avctx,
+ "unsupported channel transform bit\n");
return AVERROR_PATCHWELCOME;
}
@@ -708,8 +708,8 @@ static int decode_channel_transform(WMAProDecodeCtx* s)
if (chgroup->num_channels == 2) {
if (get_bits1(&s->gb)) {
if (get_bits1(&s->gb)) {
- av_log_ask_for_sample(s->avctx,
- "unsupported channel transform
type\n");
+ avpriv_log_ask_for_sample(s->avctx,
+ "unsupported channel
transform type\n");
}
} else {
chgroup->transform = 1;
@@ -734,8 +734,8 @@ static int decode_channel_transform(WMAProDecodeCtx* s)
} else {
/** FIXME: more than 6 coupled channels not supported
*/
if (chgroup->num_channels > 6) {
- av_log_ask_for_sample(s->avctx,
- "coupled channels > 6\n");
+ avpriv_log_ask_for_sample(s->avctx,
+ "coupled channels >
6\n");
} else {
memcpy(chgroup->decorrelation_matrix,
default_decorrelation[chgroup->num_channels],
@@ -1142,7 +1142,7 @@ static int decode_subframe(WMAProDecodeCtx *s)
/** no idea for what the following bit is used */
if (get_bits1(&s->gb)) {
- av_log_ask_for_sample(s->avctx, "reserved bit set\n");
+ avpriv_log_ask_for_sample(s->avctx, "reserved bit set\n");
return AVERROR_PATCHWELCOME;
}
@@ -1447,7 +1447,7 @@ static void save_bits(WMAProDecodeCtx *s, GetBitContext*
gb, int len,
buflen = (s->num_saved_bits + len + 8) >> 3;
if (len <= 0 || buflen > MAX_FRAMESIZE) {
- av_log_ask_for_sample(s->avctx, "input buffer too small\n");
+ avpriv_log_ask_for_sample(s->avctx, "input buffer too small\n");
s->packet_loss = 1;
return;
}
diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c
index 0e727db..3704213 100644
--- a/libavcodec/wnv1.c
+++ b/libavcodec/wnv1.c
@@ -97,13 +97,15 @@ static int decode_frame(AVCodecContext *avctx,
else {
l->shift = 8 - (buf[2] >> 4);
if (l->shift > 4) {
- av_log_ask_for_sample(avctx, "Unknown WNV1 frame header value
%i\n",
- buf[2] >> 4);
+ avpriv_log_ask_for_sample(avctx,
+ "Unknown WNV1 frame header value %i\n",
+ buf[2] >> 4);
l->shift = 4;
}
if (l->shift < 1) {
- av_log_ask_for_sample(avctx, "Unknown WNV1 frame header value
%i\n",
- buf[2] >> 4);
+ avpriv_log_ask_for_sample(avctx,
+ "Unknown WNV1 frame header value %i\n",
+ buf[2] >> 4);
l->shift = 1;
}
}
diff --git a/libavcodec/xwddec.c b/libavcodec/xwddec.c
index 274e4fa..94263b3 100644
--- a/libavcodec/xwddec.c
+++ b/libavcodec/xwddec.c
@@ -101,7 +101,7 @@ static int xwd_decode_frame(AVCodecContext *avctx, void
*data,
}
if (xoffset) {
- av_log_ask_for_sample(avctx, "unsupported xoffset %d\n", xoffset);
+ avpriv_log_ask_for_sample(avctx, "unsupported xoffset %d\n", xoffset);
return AVERROR_PATCHWELCOME;
}
@@ -201,7 +201,9 @@ static int xwd_decode_frame(AVCodecContext *avctx, void
*data,
}
if (avctx->pix_fmt == AV_PIX_FMT_NONE) {
- av_log_ask_for_sample(avctx, "unknown file: bpp %d, pixdepth %d,
vclass %d\n", bpp, pixdepth, vclass);
+ avpriv_log_ask_for_sample(avctx,
+ "unknown file: bpp %d, pixdepth %d, vclass
%d\n",
+ bpp, pixdepth, vclass);
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index 5d4254a..6542d03 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -437,18 +437,19 @@ static int decode_frame(AVCodecContext *avctx, void
*data, int *got_frame, AVPac
"Flags=%X ver=%i.%i comp=%i fmt=%i blk=%ix%i\n",
c->flags,hi_ver,lo_ver,c->comp,c->fmt,c->bw,c->bh);
if (hi_ver != 0 || lo_ver != 1) {
- av_log_ask_for_sample(avctx, "Unsupported version %i.%i\n",
- hi_ver, lo_ver);
+ avpriv_log_ask_for_sample(avctx, "Unsupported version %i.%i\n",
+ hi_ver, lo_ver);
return AVERROR_PATCHWELCOME;
}
if (c->bw == 0 || c->bh == 0) {
- av_log_ask_for_sample(avctx, "Unsupported block size %ix%i\n",
- c->bw, c->bh);
+ avpriv_log_ask_for_sample(avctx, "Unsupported block size %ix%i\n",
+ c->bw, c->bh);
return AVERROR_PATCHWELCOME;
}
if (c->comp != 0 && c->comp != 1) {
- av_log_ask_for_sample(avctx, "Unsupported compression type %i\n",
- c->comp);
+ avpriv_log_ask_for_sample(avctx,
+ "Unsupported compression type %i\n",
+ c->comp);
return AVERROR_PATCHWELCOME;
}
@@ -479,8 +480,9 @@ static int decode_frame(AVCodecContext *avctx, void *data,
int *got_frame, AVPac
default:
c->decode_intra = NULL;
c->decode_xor = NULL;
- av_log_ask_for_sample(avctx, "Unsupported (for now) format %i\n",
- c->fmt);
+ avpriv_log_ask_for_sample(avctx,
+ "Unsupported (for now) format %i\n",
+ c->fmt);
return AVERROR_PATCHWELCOME;
}
diff --git a/libavformat/anm.c b/libavformat/anm.c
index 7e52e83..8c034e5 100644
--- a/libavformat/anm.c
+++ b/libavformat/anm.c
@@ -85,7 +85,7 @@ static int read_header(AVFormatContext *s)
avio_skip(pb, 4); /* magic number */
if (avio_rl16(pb) != MAX_PAGES) {
- av_log_ask_for_sample(s, "max_pages != " AV_STRINGIFY(MAX_PAGES) "\n");
+ avpriv_log_ask_for_sample(s, "max_pages != " AV_STRINGIFY(MAX_PAGES)
"\n");
return AVERROR_PATCHWELCOME;
}
@@ -165,7 +165,7 @@ static int read_header(AVFormatContext *s)
return 0;
invalid:
- av_log_ask_for_sample(s, NULL);
+ avpriv_log_ask_for_sample(s, NULL);
ret = AVERROR_PATCHWELCOME;
fail:
diff --git a/libavformat/au.c b/libavformat/au.c
index 4645eb5..a068e2d 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -85,13 +85,13 @@ static int au_read_header(AVFormatContext *s)
codec = ff_codec_get_id(codec_au_tags, id);
if (codec == AV_CODEC_ID_NONE) {
- av_log_ask_for_sample(s, "unknown or unsupported codec tag: %u\n", id);
+ avpriv_log_ask_for_sample(s, "unknown or unsupported codec tag: %u\n",
id);
return AVERROR_PATCHWELCOME;
}
bps = av_get_bits_per_sample(codec);
if (!bps) {
- av_log_ask_for_sample(s, "could not determine bits per sample\n");
+ avpriv_log_ask_for_sample(s, "could not determine bits per sample\n");
return AVERROR_PATCHWELCOME;
}
diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c
index f41ef52..47dade0 100644
--- a/libavformat/bethsoftvid.c
+++ b/libavformat/bethsoftvid.c
@@ -108,8 +108,8 @@ static int read_frame(BVID_DemuxContext *vid, AVIOContext
*pb, AVPacket *pkt,
return AVERROR(ENOMEM);
vid->video_index = st->index;
if (vid->audio_index < 0) {
- av_log_ask_for_sample(s, "No audio packet before first video "
- "packet. Using default video time base.\n");
+ avpriv_log_ask_for_sample(s, "No audio packet before first video "
+ "packet. Using default video time
base.\n");
}
avpriv_set_pts_info(st, 64, 185, vid->sample_rate);
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
diff --git a/libavformat/filmstripdec.c b/libavformat/filmstripdec.c
index 97cecfa..c4556cf 100644
--- a/libavformat/filmstripdec.c
+++ b/libavformat/filmstripdec.c
@@ -55,7 +55,7 @@ static int read_header(AVFormatContext *s)
st->nb_frames = avio_rb32(pb);
if (avio_rb16(pb) != 0) {
- av_log_ask_for_sample(s, "unsupported packing method\n");
+ avpriv_log_ask_for_sample(s, "unsupported packing method\n");
return AVERROR_PATCHWELCOME;
}
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7fe0548..dbfbd69 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -718,7 +718,7 @@ static int mov_read_mdhd(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
version = avio_r8(pb);
if (version > 1) {
- av_log_ask_for_sample(c->fc, "unsupported version %d\n", version);
+ avpriv_log_ask_for_sample(c->fc, "unsupported version %d\n", version);
return AVERROR_PATCHWELCOME;
}
avio_rb24(pb); /* flags */
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 09ae96b..8c8d1b6 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1311,7 +1311,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc,
AVStream *st, int stream_type
}
if (st->codec->extradata) {
if (st->codec->extradata_size == 4 && memcmp(st->codec->extradata,
*pp, 4))
- av_log_ask_for_sample(fc, "DVB sub with multiple IDs\n");
+ avpriv_log_ask_for_sample(fc, "DVB sub with multiple IDs\n");
} else {
st->codec->extradata = av_malloc(4 + FF_INPUT_BUFFER_PADDING_SIZE);
if (st->codec->extradata) {
diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index 1566faa..e1b6392 100644
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@ -108,7 +108,7 @@ static int mtv_read_header(AVFormatContext *s)
audio_subsegments = avio_rl16(pb);
if (audio_subsegments == 0) {
- av_log_ask_for_sample(s, "MTV files without audio are not
supported\n");
+ avpriv_log_ask_for_sample(s, "MTV files without audio are not
supported\n");
return AVERROR_PATCHWELCOME;
}
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 18f7b26..16b7a9b 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -396,8 +396,9 @@ static int mxf_read_primer_pack(void *arg, AVIOContext *pb,
int tag, int size, U
int item_len = avio_rb32(pb);
if (item_len != 18) {
- av_log_ask_for_sample(pb, "unsupported primer pack item length %d\n",
- item_len);
+ avpriv_log_ask_for_sample(pb,
+ "unsupported primer pack item length %d\n",
+ item_len);
return AVERROR_PATCHWELCOME;
}
if (item_num > UINT_MAX / item_len)
@@ -2027,11 +2028,11 @@ static int mxf_read_packet_old(AVFormatContext *s,
AVPacket *pkt)
/* if this check is hit then it's possible OPAtom was treated
* as OP1a truncate the packet since it's probably very large
* (>2 GiB is common) */
- av_log_ask_for_sample(s,
- "KLV for edit unit %i extends into next "
- "edit unit - OPAtom misinterpreted as "
- "OP1a?\n",
- mxf->current_edit_unit);
+ avpriv_log_ask_for_sample(s,
+ "KLV for edit unit %i extends into "
+ "next edit unit - OPAtom "
+ "misinterpreted as OP1a?\n",
+ mxf->current_edit_unit);
klv.length = next_ofs - avio_tell(s->pb);
}
diff --git a/libavformat/omadec.c b/libavformat/omadec.c
index 2e565c1..18cf720 100644
--- a/libavformat/omadec.c
+++ b/libavformat/omadec.c
@@ -306,8 +306,8 @@ static int oma_read_header(AVFormatContext *s)
case OMA_CODECID_ATRAC3:
samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7]*100;
if (samplerate != 44100)
- av_log_ask_for_sample(s, "Unsupported sample rate: %d\n",
- samplerate);
+ avpriv_log_ask_for_sample(s, "Unsupported sample rate: %d\n",
+ samplerate);
framesize = (codec_params & 0x3FF) * 8;
jsflag = (codec_params >> 17) & 1; /* get stereo coding mode, 1
for joint-stereo */
diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c
index 2d57a96..499b350 100644
--- a/libavformat/rsodec.c
+++ b/libavformat/rsodec.c
@@ -49,7 +49,7 @@ static int rso_read_header(AVFormatContext *s)
bps = av_get_bits_per_sample(codec);
if (!bps) {
- av_log_ask_for_sample(s, "could not determine bits per sample\n");
+ avpriv_log_ask_for_sample(s, "could not determine bits per sample\n");
return AVERROR_PATCHWELCOME;
}
diff --git a/libavformat/smjpegdec.c b/libavformat/smjpegdec.c
index 39bb1b4..4a9f9c6 100644
--- a/libavformat/smjpegdec.c
+++ b/libavformat/smjpegdec.c
@@ -52,7 +52,7 @@ static int smjpeg_read_header(AVFormatContext *s)
avio_skip(pb, 8); // magic
version = avio_rb32(pb);
if (version)
- av_log_ask_for_sample(s, "unknown version %d\n", version);
+ avpriv_log_ask_for_sample(s, "unknown version %d\n", version);
duration = avio_rb32(pb); // in msec
@@ -77,7 +77,7 @@ static int smjpeg_read_header(AVFormatContext *s)
break;
case SMJPEG_SND:
if (ast) {
- av_log_ask_for_sample(s, "multiple audio streams not
supported\n");
+ avpriv_log_ask_for_sample(s, "multiple audio streams not
supported\n");
return AVERROR_PATCHWELCOME;
}
hlength = avio_rb32(pb);
@@ -100,7 +100,7 @@ static int smjpeg_read_header(AVFormatContext *s)
break;
case SMJPEG_VID:
if (vst) {
- av_log_ask_for_sample(s, "multiple video streams not
supported\n");
+ avpriv_log_ask_for_sample(s, "multiple video streams not
supported\n");
return AVERROR_INVALIDDATA;
}
hlength = avio_rb32(pb);
diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c
index ea29457..3125369 100644
--- a/libavformat/spdifdec.c
+++ b/libavformat/spdifdec.c
@@ -179,7 +179,7 @@ static int spdif_read_packet(AVFormatContext *s, AVPacket
*pkt)
pkt_size_bits = avio_rl16(pb);
if (pkt_size_bits % 16)
- av_log_ask_for_sample(s, "Packet does not end to a 16-bit boundary.");
+ avpriv_log_ask_for_sample(s, "Packet does not end to a 16-bit
boundary.");
ret = av_new_packet(pkt, FFALIGN(pkt_size_bits, 16) >> 3);
if (ret)
diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c
index cf421a7..ad2d48a 100644
--- a/libavformat/spdifenc.c
+++ b/libavformat/spdifenc.c
@@ -307,7 +307,7 @@ static int spdif_header_dts(AVFormatContext *s, AVPacket
*pkt)
* discs and dts-in-wav. */
ctx->use_preamble = 0;
} else if (ctx->out_bytes > ctx->pkt_offset - BURST_HEADER_SIZE) {
- av_log_ask_for_sample(s, "Unrecognized large DTS frame.");
+ avpriv_log_ask_for_sample(s, "Unrecognized large DTS frame.");
/* This will fail with a "bitrate too high" in the caller */
}
@@ -413,7 +413,7 @@ static int spdif_header_truehd(AVFormatContext *s, AVPacket
*pkt)
/* if such frames exist, we'd need some more complex logic to
* distribute the TrueHD frames in the MAT frame */
av_log(s, AV_LOG_ERROR, "TrueHD frame too big, %d bytes\n", pkt->size);
- av_log_ask_for_sample(s, NULL);
+ avpriv_log_ask_for_sample(s, NULL);
return AVERROR_PATCHWELCOME;
}
diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c
index 2a06c29..c1058e3 100644
--- a/libavformat/westwood_aud.c
+++ b/libavformat/westwood_aud.c
@@ -104,7 +104,7 @@ static int wsaud_read_header(AVFormatContext *s)
switch (codec) {
case 1:
if (channels != 1) {
- av_log_ask_for_sample(s, "Stereo WS-SND1 is not supported.\n");
+ avpriv_log_ask_for_sample(s, "Stereo WS-SND1 is not supported.\n");
return AVERROR_PATCHWELCOME;
}
st->codec->codec_id = AV_CODEC_ID_WESTWOOD_SND1;
@@ -115,7 +115,7 @@ static int wsaud_read_header(AVFormatContext *s)
st->codec->bit_rate = channels * sample_rate * 4;
break;
default:
- av_log_ask_for_sample(s, "Unknown codec: %d\n", codec);
+ avpriv_log_ask_for_sample(s, "Unknown codec: %d\n", codec);
return AVERROR_PATCHWELCOME;
}
avpriv_set_pts_info(st, 64, 1, sample_rate);
diff --git a/libavformat/xmv.c b/libavformat/xmv.c
index 3f926ef..fd9cb53 100644
--- a/libavformat/xmv.c
+++ b/libavformat/xmv.c
@@ -145,7 +145,7 @@ static int xmv_read_header(AVFormatContext *s)
file_version = avio_rl32(pb);
if ((file_version != 4) && (file_version != 2))
- av_log_ask_for_sample(s, "Found uncommon version %d\n", file_version);
+ avpriv_log_ask_for_sample(s, "Found uncommon version %d\n",
file_version);
/* Video track */
diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index baabf57..713172e 100644
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -87,7 +87,7 @@ static int xwma_read_header(AVFormatContext *s)
if (st->codec->codec_id != AV_CODEC_ID_WMAV2) {
av_log(s, AV_LOG_WARNING, "unexpected codec (tag 0x04%x; id %d)\n",
st->codec->codec_tag, st->codec->codec_id);
- av_log_ask_for_sample(s, NULL);
+ avpriv_log_ask_for_sample(s, NULL);
} else {
/* In all xWMA files I have seen, there is no extradata. But the WMA
* codecs require extradata, so we provide our own fake extradata.
@@ -103,7 +103,7 @@ static int xwma_read_header(AVFormatContext *s)
*/
av_log(s, AV_LOG_WARNING, "unexpected extradata (%d bytes)\n",
st->codec->extradata_size);
- av_log_ask_for_sample(s, NULL);
+ avpriv_log_ask_for_sample(s, NULL);
} else {
st->codec->extradata_size = 6;
st->codec->extradata = av_mallocz(6 +
FF_INPUT_BUFFER_PADDING_SIZE);
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
