diff options
| author | Benjamin Larsson <banan@ludd.ltu.se> | 2006-06-01 07:31:59 +0000 |
|---|---|---|
| committer | Benjamin Larsson <banan@ludd.ltu.se> | 2006-06-01 07:31:59 +0000 |
| commit | 0919e788ae2c0e3be075f2e09174f50294dcf8e9 (patch) | |
| tree | 4b1f2d7bb771ed55130e4f23f38fd8cddcf54731 /libavformat | |
| parent | 2d2b86c207ff434dfa91940818faf9af4a4ec1be (diff) | |
| download | ffmpeg-0919e788ae2c0e3be075f2e09174f50294dcf8e9.tar.gz | |
Flash Screen Video decoder (fourcc:FSV1)
Originally committed as revision 5436 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avienc.c | 1 | ||||
| -rw-r--r-- | libavformat/flvdec.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 82a7ff427c..04c29d1ce5 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -184,6 +184,7 @@ const CodecTag codec_bmp_tags[] = { { CODEC_ID_SNOW, MKTAG('S', 'N', 'O', 'W') }, { CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') }, { CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') }, + { CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') }, { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, { CODEC_ID_TSCC, MKTAG('t', 's', 'c', 'c') }, { CODEC_ID_ULTI, MKTAG('U', 'L', 'T', 'I') }, diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 953be09c50..9ac829c307 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -183,6 +183,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) st->codec->codec_type = CODEC_TYPE_VIDEO; switch(flags & 0xF){ case 2: st->codec->codec_id = CODEC_ID_FLV1; break; + case 3: st->codec->codec_id = CODEC_ID_FLASHSV; break; default: av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flags & 0xf); st->codec->codec_tag= flags & 0xF; |