mirror of https://git.ffmpeg.org/ffmpeg.git
flacdec: skip in stream header packets
This prevents warning messages on chained oggs with some demuxers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
23686c72e5
commit
0e9b9a6748
|
@ -505,6 +505,16 @@ static int flac_decode_frame(AVCodecContext *avctx, void *data,
|
||||||
FLAC_MAX_CHANNELS, 32);
|
FLAC_MAX_CHANNELS, 32);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (buf_size > 5 && !memcmp(buf, "\177FLAC", 5)) {
|
||||||
|
av_log(s->avctx, AV_LOG_DEBUG, "skiping flac header packet 1\n");
|
||||||
|
return buf_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (buf_size > 0 && (*buf & 0x7F) == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
|
||||||
|
av_log(s->avctx, AV_LOG_DEBUG, "skiping vorbis comment\n");
|
||||||
|
return buf_size;
|
||||||
|
}
|
||||||
|
|
||||||
/* check that there is at least the smallest decodable amount of data.
|
/* check that there is at least the smallest decodable amount of data.
|
||||||
this amount corresponds to the smallest valid FLAC frame possible.
|
this amount corresponds to the smallest valid FLAC frame possible.
|
||||||
FF F8 69 02 00 00 9A 00 00 34 46 */
|
FF F8 69 02 00 00 9A 00 00 34 46 */
|
||||||
|
|
Loading…
Reference in New Issue