mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
Support Sorenson Spark in f4v files streamed by Flash Media Server.
This commit is contained in:
parent
873049e6d8
commit
5442083b1c
@ -227,7 +227,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
|
||||
|
||||
{ AV_CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') },
|
||||
{ AV_CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */
|
||||
// { AV_CODEC_ID_FLV1, MKTAG('H', '2', '6', '3') }, /* Flash Media Server */
|
||||
// { AV_CODEC_ID_FLV1, MKTAG('H', '2', '6', '3') }, /* Flash Media Server, forced in demuxer */
|
||||
{ AV_CODEC_ID_MSMPEG4V3, MKTAG('3', 'I', 'V', 'D') }, /* 3ivx DivX Doctor */
|
||||
{ AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'V', '1', 'x') }, /* AVID 1:1x */
|
||||
{ AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'u', 'p') },
|
||||
|
@ -1259,7 +1259,6 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
|
||||
int color_greyscale;
|
||||
int color_table_id;
|
||||
|
||||
st->codec->codec_id = id;
|
||||
avio_rb16(pb); /* version */
|
||||
avio_rb16(pb); /* revision level */
|
||||
avio_rb32(pb); /* vendor */
|
||||
@ -1283,6 +1282,11 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
|
||||
/* codec_tag YV12 triggers an UV swap in rawdec.c */
|
||||
if (!memcmp(st->codec->codec_name, "Planar Y'CbCr 8-bit 4:2:0", 25))
|
||||
st->codec->codec_tag=MKTAG('I', '4', '2', '0');
|
||||
/* Flash Media Server streams files with Sorenson Spark and tag H263 */
|
||||
if (!memcmp(st->codec->codec_name, "Sorenson H263", 13)
|
||||
&& format == MKTAG('H','2','6','3'))
|
||||
id = AV_CODEC_ID_FLV1;
|
||||
st->codec->codec_id = id;
|
||||
|
||||
st->codec->bits_per_coded_sample = avio_rb16(pb); /* depth */
|
||||
color_table_id = avio_rb16(pb); /* colortable id */
|
||||
|
Loading…
Reference in New Issue
Block a user