#include "avformat.h"
#include "rawdec.h"
-static int ac3_eac3_probe(AVProbeData *p, enum AVCodecID expected_codec_id)
+static int ac3_eac3_probe(const AVProbeData *p, enum AVCodecID expected_codec_id)
{
int max_frames, first_frames = 0, frames;
const uint8_t *buf, *buf2, *end;
uint16_t frame_size;
int i, ret;
- if(!memcmp(buf2, "\x1\x10\0\0\0\0\0\0", 8)) {
+ if(!memcmp(buf2, "\x1\x10", 2)) {
if (buf2 + 16 > end)
break;
buf2+=16;
}
#if CONFIG_AC3_DEMUXER
-static int ac3_probe(AVProbeData *p)
+static int ac3_probe(const AVProbeData *p)
{
return ac3_eac3_probe(p, AV_CODEC_ID_AC3);
}
-AVInputFormat ff_ac3_demuxer = {
+FF_RAW_DEMUXER_CLASS(ac3)
+const AVInputFormat ff_ac3_demuxer = {
.name = "ac3",
.long_name = NULL_IF_CONFIG_SMALL("raw AC-3"),
.read_probe = ac3_probe,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "ac3",
.raw_codec_id = AV_CODEC_ID_AC3,
+ .priv_data_size = sizeof(FFRawDemuxerContext),
+ .priv_class = &ac3_demuxer_class,
};
#endif
#if CONFIG_EAC3_DEMUXER
-static int eac3_probe(AVProbeData *p)
+static int eac3_probe(const AVProbeData *p)
{
return ac3_eac3_probe(p, AV_CODEC_ID_EAC3);
}
-AVInputFormat ff_eac3_demuxer = {
+FF_RAW_DEMUXER_CLASS(eac3)
+const AVInputFormat ff_eac3_demuxer = {
.name = "eac3",
.long_name = NULL_IF_CONFIG_SMALL("raw E-AC-3"),
.read_probe = eac3_probe,
.flags = AVFMT_GENERIC_INDEX,
.extensions = "eac3",
.raw_codec_id = AV_CODEC_ID_EAC3,
+ .priv_data_size = sizeof(FFRawDemuxerContext),
+ .priv_class = &eac3_demuxer_class,
};
#endif