mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Return proper error code after av_log_ask_for_sample()
This commit is contained in:
parent
ed40b6bf07
commit
f3298f1299
@ -158,7 +158,7 @@ static int decode_frame(AVCodecContext *avctx,
|
||||
break; // stop
|
||||
if (type == 2) {
|
||||
av_log_ask_for_sample(avctx, "unknown opcode");
|
||||
return AVERROR_INVALIDDATA;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
@ -334,7 +334,7 @@ static int cinepak_decode (CinepakContext *s)
|
||||
if (s->sega_film_skip_bytes == -1) {
|
||||
if (!encoded_buf_size) {
|
||||
av_log_ask_for_sample(s->avctx, "encoded_buf_size is 0");
|
||||
return AVERROR_INVALIDDATA;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
if (encoded_buf_size != s->size && (s->size % encoded_buf_size) != 0) {
|
||||
/* If the encoded frame size differs from the frame size as indicated
|
||||
|
@ -2873,7 +2873,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
|
||||
av_log_ask_for_sample(s->avctx, NULL);
|
||||
s->picture_structure = last_pic_structure;
|
||||
s->droppable = last_pic_droppable;
|
||||
return AVERROR_INVALIDDATA;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
/* Take ownership of this buffer. Note that if another thread owned
|
||||
|
@ -123,7 +123,7 @@ static int decode_frame(AVCodecContext *avctx,
|
||||
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");
|
||||
return AVERROR_INVALIDDATA;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
if (bytestream2_peek_byte(&s->g) == 0xFF) {
|
||||
|
@ -57,7 +57,7 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
|
||||
|
||||
if (bytes_per_pixel != 2) {
|
||||
av_log_ask_for_sample(avctx, "Image format is not RGB15.\n");
|
||||
return -1;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
avctx->pix_fmt = AV_PIX_FMT_RGB555;
|
||||
|
@ -356,7 +356,7 @@ static int truemotion1_decode_header(TrueMotion1Context *s)
|
||||
if (s->flags & FLAG_SPRITE) {
|
||||
av_log_ask_for_sample(s->avctx, "SPRITE frame found.\n");
|
||||
/* FIXME header.width, height, xoffset and yoffset aren't initialized */
|
||||
return -1;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
} else {
|
||||
s->w = header.xsize;
|
||||
s->h = header.ysize;
|
||||
|
@ -65,7 +65,7 @@ static av_cold int truespeech_decode_init(AVCodecContext * avctx)
|
||||
|
||||
if (avctx->channels != 1) {
|
||||
av_log_ask_for_sample(avctx, "Unsupported channel count: %d\n", avctx->channels);
|
||||
return AVERROR(EINVAL);
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
avctx->channel_layout = AV_CH_LAYOUT_MONO;
|
||||
|
@ -203,7 +203,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
|
||||
|
||||
} else {
|
||||
av_log_ask_for_sample(avctx, "Unsupported extradata size\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
/* generic init */
|
||||
|
@ -299,7 +299,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
|
||||
|
||||
} else {
|
||||
av_log_ask_for_sample(avctx, "Unknown extradata size\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
/** generic init */
|
||||
@ -680,7 +680,7 @@ static int decode_channel_transform(WMAProDecodeCtx* s)
|
||||
if (get_bits1(&s->gb)) {
|
||||
av_log_ask_for_sample(s->avctx,
|
||||
"unsupported channel transform bit\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
for (s->num_chgroups = 0; remaining_channels &&
|
||||
@ -1150,7 +1150,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");
|
||||
return AVERROR_INVALIDDATA;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
|
||||
|
@ -86,7 +86,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");
|
||||
return AVERROR_INVALIDDATA;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
anm->nb_pages = avio_rl16(pb);
|
||||
@ -166,7 +166,7 @@ static int read_header(AVFormatContext *s)
|
||||
|
||||
invalid:
|
||||
av_log_ask_for_sample(s, NULL);
|
||||
ret = AVERROR_INVALIDDATA;
|
||||
ret = AVERROR_PATCHWELCOME;
|
||||
|
||||
fail:
|
||||
return ret;
|
||||
|
@ -82,7 +82,7 @@ static int au_read_header(AVFormatContext *s)
|
||||
|
||||
if (!av_get_bits_per_sample(codec)) {
|
||||
av_log_ask_for_sample(s, "could not determine bits per sample\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
if (channels == 0 || channels > 64) {
|
||||
|
@ -56,7 +56,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");
|
||||
return AVERROR_INVALIDDATA;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
avio_skip(pb, 2);
|
||||
|
@ -109,7 +109,7 @@ static int mtv_read_header(AVFormatContext *s)
|
||||
|
||||
if (audio_subsegments == 0) {
|
||||
av_log_ask_for_sample(s, "MTV files without audio are not supported\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
mtv->full_segment_size =
|
||||
|
@ -50,7 +50,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");
|
||||
return AVERROR_INVALIDDATA;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
/* now we are ready: build format streams */
|
||||
|
@ -78,7 +78,7 @@ static int smjpeg_read_header(AVFormatContext *s)
|
||||
case SMJPEG_SND:
|
||||
if (ast) {
|
||||
av_log_ask_for_sample(s, "multiple audio streams not supported\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
hlength = avio_rb32(pb);
|
||||
if (hlength < 8)
|
||||
|
@ -414,7 +414,7 @@ static int spdif_header_truehd(AVFormatContext *s, AVPacket *pkt)
|
||||
* 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);
|
||||
return AVERROR_INVALIDDATA;
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
memcpy(&ctx->hd_buf[ctx->hd_buf_count * TRUEHD_FRAME_OFFSET - BURST_HEADER_SIZE + mat_code_length],
|
||||
|
Loading…
Reference in New Issue
Block a user