[FFmpeg-cvslog] r11843 - trunk/libavformat/nutdec.c

michael subversion
Mon Feb 4 01:33:52 CET 2008


Author: michael
Date: Mon Feb  4 01:33:52 2008
New Revision: 11843

Log:
Fix info packet type, found by oded as well as the new pedantic const
warnings.


Modified:
   trunk/libavformat/nutdec.c

Modified: trunk/libavformat/nutdec.c
==============================================================================
--- trunk/libavformat/nutdec.c	(original)
+++ trunk/libavformat/nutdec.c	Mon Feb  4 01:33:52 2008
@@ -360,7 +360,7 @@ static int decode_info_header(NUTContext
     int chapter_id, i;
     int64_t value, end;
     char name[256], str_value[1024], type_str[256];
-    const char *type= type_str;
+    const char *type;
 
     end= get_packetheader(nut, bc, 1, INFO_STARTCODE);
     end += url_ftell(bc);
@@ -377,7 +377,8 @@ static int decode_info_header(NUTContext
             type= "UTF-8";
             get_str(bc, str_value, sizeof(str_value));
         }else if(value == -2){
-            get_str(bc, type, sizeof(type));
+            get_str(bc, type_str, sizeof(type_str));
+            type= type_str;
             get_str(bc, str_value, sizeof(str_value));
         }else if(value == -3){
             type= "s";




More information about the ffmpeg-cvslog mailing list