[FFmpeg-cvslog] r20563 - in trunk: libavcodec/avcodec.h libavformat/flvdec.c

[daniel]

Author: daniel
Date: Fri Nov 20 20:16:42 2009
New Revision: 20563

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

Modified:
   trunk/libavcodec/avcodec.h
   trunk/libavformat/flvdec.c

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	Fri Nov 20 12:38:37 2009	(r20562)
+++ trunk/libavcodec/avcodec.h	Fri Nov 20 20:16:42 2009	(r20563)
@@ -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,

Modified: trunk/libavformat/flvdec.c
==============================================================================
--- trunk/libavformat/flvdec.c	Fri Nov 20 12:38:37 2009	(r20562)
+++ trunk/libavformat/flvdec.c	Fri Nov 20 20:16:42 2009	(r20563)
@@ -82,6 +82,7 @@ static int flv_set_video_codec(AVFormatC
     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)