Commit 0aa6a518 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

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
parent b16569d2
......@@ -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,
......
......@@ -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)
......
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