summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/012v.c2
-rw-r--r--libavcodec/adpcm.c4
-rw-r--r--libavcodec/atrac1.c2
-rw-r--r--libavcodec/cook.c2
-rw-r--r--libavcodec/dcadec.c6
-rw-r--r--libavcodec/exr.c2
-rw-r--r--libavcodec/iff.c4
-rw-r--r--libavcodec/mjpegdec.c2
-rw-r--r--libavcodec/mpegaudiodec.c2
-rw-r--r--libavcodec/mvcdec.c2
-rw-r--r--libavcodec/paf.c2
-rw-r--r--libavcodec/qdm2.c2
-rw-r--r--libavcodec/ra288.c2
-rw-r--r--libavcodec/sanm.c6
-rw-r--r--libavcodec/sgirledec.c2
-rw-r--r--libavcodec/vc1dec.c2
-rw-r--r--libavcodec/vcr1.c2
17 files changed, 23 insertions, 23 deletions
diff --git a/libavcodec/012v.c b/libavcodec/012v.c
index bb915c2e8b..58e3cd6fbd 100644
--- a/libavcodec/012v.c
+++ b/libavcodec/012v.c
@@ -30,7 +30,7 @@ static av_cold int zero12v_decode_init(AVCodecContext *avctx)
avctx->bits_per_raw_sample = 10;
if (avctx->codec_tag == MKTAG('a', '1', '2', 'v'))
- av_log_ask_for_sample(avctx, "Samples with actual transparency needed\n");
+ avpriv_request_sample(avctx, "transparency");
return 0;
}
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 3d6115c5c2..3f8cfbcf53 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -323,7 +323,7 @@ static int xa_decode(AVCodecContext *avctx, int16_t *out0, int16_t *out1,
shift = 12 - (in[4+i*2] & 15);
filter = in[4+i*2] >> 4;
if (filter >= FF_ARRAY_ELEMS(xa_adpcm_table)) {
- av_log_ask_for_sample(avctx, "unknown XA-ADPCM filter %d\n", filter);
+ avpriv_request_sample(avctx, "unknown XA-ADPCM filter %d", filter);
filter=0;
}
f0 = xa_adpcm_table[filter][0];
@@ -352,7 +352,7 @@ static int xa_decode(AVCodecContext *avctx, int16_t *out0, int16_t *out1,
shift = 12 - (in[5+i*2] & 15);
filter = in[5+i*2] >> 4;
if (filter >= FF_ARRAY_ELEMS(xa_adpcm_table)) {
- av_log_ask_for_sample(avctx, "unknown XA-ADPCM filter %d\n", filter);
+ avpriv_request_sample(avctx, "unknown XA-ADPCM filter %d", filter);
filter=0;
}
diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c
index ff7dd3ee48..7c1d1ebccd 100644
--- a/libavcodec/atrac1.c
+++ b/libavcodec/atrac1.c
@@ -342,7 +342,7 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx)
}
if (avctx->block_align <= 0) {
- av_log_ask_for_sample(avctx, "unsupported block align\n");
+ av_log(avctx, AV_LOG_ERROR, "Unsupported block align.");
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index ffdb13c1ab..08cd4017fc 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -1202,7 +1202,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
return AVERROR_PATCHWELCOME;
}
if (q->subpacket[s].subbands == 0) {
- av_log_ask_for_sample(avctx, "subbands is 0\n");
+ avpriv_request_sample(avctx, "subbands = 0");
return AVERROR_PATCHWELCOME;
}
q->subpacket[s].gains1.now = q->subpacket[s].gain_1;
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index 724f0f8246..cf4412c5cc 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -739,7 +739,7 @@ static int dca_parse_frame_header(DCAContext *s)
if (s->lfe == 3) {
s->lfe = 0;
- av_log_ask_for_sample(s->avctx, "LFE is 3\n");
+ avpriv_request_sample(s->avctx, "LFE = 3");
return AVERROR_PATCHWELCOME;
}
@@ -1012,7 +1012,7 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index)
/* Scale factor index */
quant7 = get_bits(&s->gb, 8);
if (quant7 > 127) {
- av_log_ask_for_sample(s->avctx, "LFEScaleIndex larger than 127\n");
+ avpriv_request_sample(s->avctx, "LFEScaleIndex larger than 127");
return AVERROR_INVALIDDATA;
}
s->lfe_scale_factor = scale_factor_quant7[quant7];
@@ -2167,7 +2167,7 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
}
if (s->xch_base_channel < 2) {
- av_log_ask_for_sample(avctx, "XCh with fewer than 2 base channels is not supported\n");
+ avpriv_request_sample(avctx, "XCh with fewer than 2 base channels");
continue;
}
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 4e7c19ce1b..af1bee0aae 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -697,7 +697,7 @@ static int decode_frame(AVCodecContext *avctx,
avctx->pix_fmt = AV_PIX_FMT_RGB48;
break;
case EXR_UINT:
- av_log_missing_feature(avctx, "32-bit unsigned int", 1);
+ avpriv_request_sample(avctx, "32-bit unsigned int");
return AVERROR_PATCHWELCOME;
default:
av_log(avctx, AV_LOG_ERROR, "Missing channel list\n");
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 822a981643..716a7314e2 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -345,7 +345,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
} else if (avctx->bits_per_coded_sample == 32) {
avctx->pix_fmt = AV_PIX_FMT_BGR32;
} else {
- av_log_ask_for_sample(avctx, "unknown bits_per_coded_sample\n");
+ avpriv_request_sample(avctx, "unknown bits_per_coded_sample");
return AVERROR_PATCHWELCOME;
}
}
@@ -646,7 +646,7 @@ static void decode_deep_tvdc32(uint8_t *dst, const uint8_t *src, int src_size, i
static int unsupported(AVCodecContext *avctx)
{
IffContext *s = avctx->priv_data;
- av_log_ask_for_sample(avctx, "unsupported bitmap (compression %i, bpp %i, ham %i)\n", s->compression, s->bpp, s->ham);
+ avpriv_request_sample(avctx, "bitmap (compression %i, bpp %i, ham %i)", s->compression, s->bpp, s->ham);
return AVERROR_INVALIDDATA;
}
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 78ba8e840a..5880fec4b8 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -330,7 +330,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
if (s->interlaced && (s->bottom_field == !s->interlace_polarity)) {
if (s->progressive) {
- av_log_ask_for_sample(s->avctx, "progressively coded interlaced pictures not supported\n");
+ avpriv_request_sample(s->avctx, "progressively coded interlaced picture");
return AVERROR_INVALIDDATA;
}
} else{
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index f7fdeb5334..4fffb6c878 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -209,7 +209,7 @@ static void ff_compute_band_indexes(MPADecodeContext *s, GranuleDef *g)
if (g->block_type == 2) {
if (g->switch_point) {
if(s->sample_rate_index == 8)
- av_log_ask_for_sample(s->avctx, "switch point in 8khz\n");
+ avpriv_request_sample(s->avctx, "switch point in 8khz");
/* if switched mode, we handle the 36 first samples as
long blocks. For 8000Hz, we handle the 72 first
exponents as long blocks */
diff --git a/libavcodec/mvcdec.c b/libavcodec/mvcdec.c
index 54e975717f..c4385fe5a5 100644
--- a/libavcodec/mvcdec.c
+++ b/libavcodec/mvcdec.c
@@ -150,7 +150,7 @@ static int decode_mvc2(AVCodecContext *avctx, GetByteContext *gb, uint8_t *dst_s
av_log(avctx, AV_LOG_WARNING, "dimension mismatch\n");
if (bytestream2_get_byteu(gb)) {
- av_log_ask_for_sample(avctx, "bitmap feature\n");
+ avpriv_request_sample(avctx, "bitmap feature");
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/paf.c b/libavcodec/paf.c
index 5ff09b9816..789231498c 100644
--- a/libavcodec/paf.c
+++ b/libavcodec/paf.c
@@ -342,7 +342,7 @@ static int paf_vid_decode(AVCodecContext *avctx, void *data,
}
break;
default:
- av_log_ask_for_sample(avctx, "unknown/invalid code\n");
+ avpriv_request_sample(avctx, "unknown/invalid code");
return AVERROR_INVALIDDATA;
}
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 977528e295..108c327d53 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -646,7 +646,7 @@ static void fill_coding_method_array (sb_int8_array tone_level_idx, sb_int8_arra
if (!superblocktype_2_3) {
/* This case is untested, no samples available */
- av_log_ask_for_sample(NULL, "!superblocktype_2_3");
+ avpriv_request_sample(NULL, "!superblocktype_2_3");
return;
for (ch = 0; ch < nb_channels; ch++)
for (sb = 0; sb < 30; sb++) {
diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c
index 7269783345..393ea0bfbf 100644
--- a/libavcodec/ra288.c
+++ b/libavcodec/ra288.c
@@ -68,7 +68,7 @@ static av_cold int ra288_decode_init(AVCodecContext *avctx)
avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
if (avctx->block_align <= 0) {
- av_log_ask_for_sample(avctx, "unsupported block align\n");
+ av_log(avctx, AV_LOG_ERROR, "unsupported block align\n");
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c
index 66ff52257f..f217ef36bb 100644
--- a/libavcodec/sanm.c
+++ b/libavcodec/sanm.c
@@ -760,7 +760,7 @@ static int process_frame_obj(SANMVideoContext *ctx)
return old_codec47(ctx, top, left, w, h);
break;
default:
- av_log_ask_for_sample(ctx->avctx, "unknown subcodec %d\n", codec);
+ avpriv_request_sample(ctx->avctx, "unknown subcodec %d", codec);
return AVERROR_PATCHWELCOME;
}
}
@@ -784,7 +784,7 @@ static int decode_0(SANMVideoContext *ctx)
static int decode_nop(SANMVideoContext *ctx)
{
- av_log_ask_for_sample(ctx->avctx, "unknown/unsupported compression type\n");
+ avpriv_request_sample(ctx->avctx, "unknown/unsupported compression type");
return AVERROR_PATCHWELCOME;
}
@@ -1271,7 +1271,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
return ret;
}
} else {
- av_log_ask_for_sample(avctx, "subcodec %d is not implemented\n",
+ avpriv_request_sample(avctx, "subcodec %d",
header.codec);
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/sgirledec.c b/libavcodec/sgirledec.c
index d49a957b8a..9d6cdbab73 100644
--- a/libavcodec/sgirledec.c
+++ b/libavcodec/sgirledec.c
@@ -101,7 +101,7 @@ static int decode_sgirle8(AVCodecContext *avctx, uint8_t *dst, const uint8_t *sr
v -= length;
} while (v > 0);
} else {
- av_log_ask_for_sample(avctx, "unknown opcode\n");
+ avpriv_request_sample(avctx, "opcode %d", v);
return AVERROR_PATCHWELCOME;
}
}
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index d7b2f9c7d1..aea2bbb897 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -5287,7 +5287,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
v->output_height > 1 << 14) return -1;
if ((v->sprite_width&1) || (v->sprite_height&1)) {
- av_log_ask_for_sample(avctx, "odd sprites are not supported\n");
+ avpriv_request_sample(avctx, "odd sprites support");
return AVERROR_PATCHWELCOME;
}
}
diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
index e9c988e90a..60bfcce41e 100644
--- a/libavcodec/vcr1.c
+++ b/libavcodec/vcr1.c
@@ -38,7 +38,7 @@ static av_cold int vcr1_decode_init(AVCodecContext *avctx)
avctx->pix_fmt = AV_PIX_FMT_YUV410P;
if (avctx->width % 8 || avctx->height%4) {
- av_log_ask_for_sample(avctx, "odd dimensions are not supported\n");
+ avpriv_request_sample(avctx, "odd dimensions support");
return AVERROR_PATCHWELCOME;
}
return 0;
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 16:25:01 +0000