summaryrefslogtreecommitdiff
path: root/libavformat/nutdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-02-04 00:33:52 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-02-04 00:33:52 +0000
commit0fca8bc835b8fa1d804cdc60bca15a445c40d07f (patch)
tree42cf9bddead3f3b72f1bcec43d29925bb086b929 /libavformat/nutdec.c
parent7ebab679012930ed7829c234c08a4ea307ea633a (diff)
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
Diffstat (limited to 'libavformat/nutdec.c')
-rw-r--r--libavformat/nutdec.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index dff09c220d..b457b47646 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -360,7 +360,7 @@ static int decode_info_header(NUTContext *nut){
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 *nut){
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";