Commit 0fca8bc8 authored by Michael Niedermayer's avatar Michael Niedermayer

Fix info packet type, found by oded as well as the new pedantic const

warnings.

Originally committed as revision 11843 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7ebab679
...@@ -360,7 +360,7 @@ static int decode_info_header(NUTContext *nut){ ...@@ -360,7 +360,7 @@ static int decode_info_header(NUTContext *nut){
int chapter_id, i; int chapter_id, i;
int64_t value, end; int64_t value, end;
char name[256], str_value[1024], type_str[256]; 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= get_packetheader(nut, bc, 1, INFO_STARTCODE);
end += url_ftell(bc); end += url_ftell(bc);
...@@ -377,7 +377,8 @@ static int decode_info_header(NUTContext *nut){ ...@@ -377,7 +377,8 @@ static int decode_info_header(NUTContext *nut){
type= "UTF-8"; type= "UTF-8";
get_str(bc, str_value, sizeof(str_value)); get_str(bc, str_value, sizeof(str_value));
}else if(value == -2){ }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)); get_str(bc, str_value, sizeof(str_value));
}else if(value == -3){ }else if(value == -3){
type= "s"; type= "s";
......
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