Author: ods15 Date: Sat Mar 11 11:00:02 2006 New Revision: 88 Log: sync to spec, remove info crud from demuxer Modified: trunk/libnut/demuxer.c trunk/libnut/muxer.c Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Mar 11 11:00:02 2006 @@ -811,31 +811,6 @@ } int nut_read_info(nut_context_t * nut, nut_info_packet_t * info []) { -#if 0 - BufferContext *tmp = new_mem_buffer(); - - for(;;){ - char * type; - int id = info[0].id; - put_v(tmp, id); - if (!id) break; - type = info_table[id].type; - if (!type) { - type = info[0].type.data; - put_vb(tmp, info[0].type.len, info[0].type.data); - } - if (!info_table[id].name) - put_vb(tmp, info[0].name.len, info[0].name.data); - if (!strcmp(type, "v")) - put_v(tmp, info[0].val.i); - else - put_vb(tmp, info[0].val.s.len, info[0].val.s.data); - id++; - } - - put_header(nut->i, tmp, INFO_STARTCODE, 1); - free_buffer(tmp); -#endif return 0; } Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Sat Mar 11 11:00:02 2006 @@ -354,10 +354,8 @@ put_v(tmp, info->stream_id_plus1); put_v(tmp, info->chapter_id); - if (info->chapter_id) { - put_v(tmp, info->chapter_start); - put_v(tmp, info->chapter_len); - } + put_v(tmp, info->chapter_start); + put_v(tmp, info->chapter_len); put_v(tmp, info->count); for(i = 0; i < info->count; i++){ @@ -368,8 +366,11 @@ } else if (!strcmp(field->type, "s")) { put_s(tmp, -3); put_s(tmp, field->val); + } else if (!strcmp(field->type, "t")) { + put_s(tmp, -4); + put_v(tmp, field->val); } else if (!strcmp(field->type, "r")) { - put_s(tmp, -(field->den + 3)); + put_s(tmp, -(field->den + 4)); put_s(tmp, field->val); } else { if (strcmp(field->type, "UTF-8")) {