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

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 7ffbd95955bdd2494a583adeaa52c0b2bdb5ae3f..ac3b803803efedf74167e75cfaf64716dfd960e1 100644 (file)
--- 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 27062dcb97e3ec993a8dffd2a9960b9238793733..2be5e2d689b6c27e70dcf8699bbe7d2c778ff2fe 100644 (file)
--- 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)