Commit 7ba34c7c authored by daniel's avatar daniel

Add codec id for Flash screen codec v2 and hook it up in FLV demuxer



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20563 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent e41cbbd9
...@@ -199,6 +199,7 @@ enum CodecID { ...@@ -199,6 +199,7 @@ enum CodecID {
CODEC_ID_DPX, CODEC_ID_DPX,
CODEC_ID_MAD, CODEC_ID_MAD,
CODEC_ID_FRWU, CODEC_ID_FRWU,
CODEC_ID_FLASHSV2,
/* various PCM "codecs" */ /* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000, CODEC_ID_PCM_S16LE= 0x10000,
......
...@@ -82,6 +82,7 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_co ...@@ -82,6 +82,7 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_co
switch(flv_codecid) { switch(flv_codecid) {
case FLV_CODECID_H263 : vcodec->codec_id = CODEC_ID_FLV1 ; break; 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_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_VP6 : vcodec->codec_id = CODEC_ID_VP6F ;
case FLV_CODECID_VP6A : case FLV_CODECID_VP6A :
if(flv_codecid == FLV_CODECID_VP6A) if(flv_codecid == FLV_CODECID_VP6A)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment