avidec.c (libav-12) | : | avidec.c (libav-12.1) | ||
---|---|---|---|---|
skipping to change at line 616 | skipping to change at line 616 | |||
switch (codec_type) { | switch (codec_type) { | |||
case AVMEDIA_TYPE_VIDEO: | case AVMEDIA_TYPE_VIDEO: | |||
if (amv_file_format) { | if (amv_file_format) { | |||
st->codecpar->width = avih_width; | st->codecpar->width = avih_width; | |||
st->codecpar->height = avih_height; | st->codecpar->height = avih_height; | |||
st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; | st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; | |||
st->codecpar->codec_id = AV_CODEC_ID_AMV; | st->codecpar->codec_id = AV_CODEC_ID_AMV; | |||
avio_skip(pb, size); | avio_skip(pb, size); | |||
break; | break; | |||
} | } | |||
tag1 = ff_get_bmp_header(pb, st); | tag1 = ff_get_bmp_header(pb, st, NULL); | |||
if (tag1 == MKTAG('D', 'X', 'S', 'B') || | if (tag1 == MKTAG('D', 'X', 'S', 'B') || | |||
tag1 == MKTAG('D', 'X', 'S', 'A')) { | tag1 == MKTAG('D', 'X', 'S', 'A')) { | |||
st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; | st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; | |||
st->codecpar->codec_tag = tag1; | st->codecpar->codec_tag = tag1; | |||
st->codecpar->codec_id = AV_CODEC_ID_XSUB; | st->codecpar->codec_id = AV_CODEC_ID_XSUB; | |||
break; | break; | |||
} | } | |||
if (size > 10 * 4 && size < (1 << 30)) { | if (size > 10 * 4 && size < (1 << 30)) { | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |