diff options
| author | Daniel Verkamp <daniel@drv.nu> | 2009-11-20 19:16:42 +0000 |
|---|---|---|
| committer | Daniel Verkamp <daniel@drv.nu> | 2009-11-20 19:16:42 +0000 |
| commit | 0aa6a518ad1cd1715f9cff53c7c6684aefd0501c (patch) | |
| tree | 7311ec93f61df5a611717d5a1ea89ab0070b9dd9 | |
| parent | b16569d256e39106fa6f2d277ed04724fd52ac88 (diff) | |
| download | ffmpeg-0aa6a518ad1cd1715f9cff53c7c6684aefd0501c.tar.gz | |
Add codec id for Flash screen codec v2 and hook it up in FLV demuxer
Originally committed as revision 20563 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavformat/flvdec.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7ffbd95955..ac3b803803 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -199,6 +199,7 @@ enum CodecID { CODEC_ID_DPX, CODEC_ID_MAD, CODEC_ID_FRWU, + CODEC_ID_FLASHSV2, /* various PCM "codecs" */ CODEC_ID_PCM_S16LE= 0x10000, diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 27062dcb97..2be5e2d689 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -82,6 +82,7 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_co switch(flv_codecid) { case FLV_CODECID_H263 : vcodec->codec_id = CODEC_ID_FLV1 ; break; case FLV_CODECID_SCREEN: vcodec->codec_id = CODEC_ID_FLASHSV; break; + case FLV_CODECID_SCREEN2: vcodec->codec_id = CODEC_ID_FLASHSV2; break; case FLV_CODECID_VP6 : vcodec->codec_id = CODEC_ID_VP6F ; case FLV_CODECID_VP6A : if(flv_codecid == FLV_CODECID_VP6A) |