mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
wtv: make ff_format_videoinfo2 visible to wtv encoder
Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
129ce05b02
commit
686b6dc33a
@ -55,4 +55,6 @@ extern const ff_asf_guid ff_mediasubtype_cpfilters_processed;
|
||||
extern const ff_asf_guid ff_format_cpfilters_processed;
|
||||
extern const ff_asf_guid ff_format_waveformatex;
|
||||
extern const ff_asf_guid ff_format_mpeg2_video;
|
||||
extern const ff_asf_guid ff_format_videoinfo2;
|
||||
|
||||
#endif /* AVFORMAT_WTV_H */
|
||||
|
@ -75,6 +75,8 @@ const ff_asf_guid ff_format_waveformatex =
|
||||
{0x81,0x9F,0x58,0x05,0x56,0xC3,0xCE,0x11,0xBF,0x01,0x00,0xAA,0x00,0x55,0x59,0x5A};
|
||||
const ff_asf_guid ff_format_mpeg2_video =
|
||||
{0xE3,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA};
|
||||
const ff_asf_guid ff_format_videoinfo2 =
|
||||
{0xA0,0x76,0x2A,0xF7,0x0A,0xEB,0xD0,0x11,0xAC,0xE4,0x00,0x00,0xC0,0xCC,0x16,0xBA};
|
||||
|
||||
const AVCodecGuid ff_video_guids[] = {
|
||||
{AV_CODEC_ID_MPEG2VIDEO, {0x26,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA}},
|
||||
|
@ -372,10 +372,6 @@ static const ff_asf_guid mediasubtype_dtvccdata =
|
||||
static const ff_asf_guid mediasubtype_mpeg2_sections =
|
||||
{0x79,0x85,0x9F,0x4A,0xF8,0x6B,0x92,0x43,0x8A,0x6D,0xD2,0xDD,0x09,0xFA,0x78,0x61};
|
||||
|
||||
/* Formats */
|
||||
static const ff_asf_guid format_videoinfo2 =
|
||||
{0xA0,0x76,0x2A,0xF7,0x0A,0xEB,0xD0,0x11,0xAC,0xE4,0x00,0x00,0xC0,0xCC,0x16,0xBA};
|
||||
|
||||
static int read_probe(AVProbeData *p)
|
||||
{
|
||||
return ff_guidcmp(p->buf, ff_wtv_guid) ? 0 : AVPROBE_SCORE_MAX;
|
||||
@ -691,7 +687,7 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid,
|
||||
st = new_stream(s, st, sid, AVMEDIA_TYPE_VIDEO);
|
||||
if (!st)
|
||||
return NULL;
|
||||
if (!ff_guidcmp(formattype, format_videoinfo2)) {
|
||||
if (!ff_guidcmp(formattype, ff_format_videoinfo2)) {
|
||||
int consumed = parse_videoinfoheader2(s, st);
|
||||
avio_skip(pb, FFMAX(size - consumed, 0));
|
||||
} else if (!ff_guidcmp(formattype, ff_format_mpeg2_video)) {
|
||||
|
Loading…
Reference in New Issue
Block a user