[Ffmpeg-cvslog] r5900 - trunk/libavcodec/vc1.c

[kostya]

Author: kostya
Date: Thu Aug  3 07:09:36 2006
New Revision: 5900

Modified:
   trunk/libavcodec/vc1.c

Log:
Don't try to decode P-frames from old WMV3 variant until their format is figured


Modified: trunk/libavcodec/vc1.c
==============================================================================
--- trunk/libavcodec/vc1.c	(original)
+++ trunk/libavcodec/vc1.c	Thu Aug  3 07:09:36 2006
@@ -1207,8 +1207,10 @@
         v->res_rtm_flag = get_bits(gb, 1); //reserved
         if (!v->res_rtm_flag)
         {
+//            av_log(avctx, AV_LOG_ERROR,
+//                   "0 for reserved RES_RTM_FLAG is forbidden\n");
             av_log(avctx, AV_LOG_ERROR,
-                   "0 for reserved RES_RTM_FLAG is forbidden\n");
+                   "Old WMV3 version detected, only I-frames will be decoded\n");
             //return -1;
         }
         av_log(avctx, AV_LOG_DEBUG,
@@ -3125,7 +3127,7 @@
     if(vc1_parse_frame_header(v, &s->gb) == -1)
         return -1;
 
-//    if(s->pict_type != I_TYPE && s->pict_type != P_TYPE)return -1;
+    if(s->pict_type != I_TYPE && !v->res_rtm_flag)return -1;
 
     // for hurry_up==5
     s->current_picture.pict_type= s->pict_type;