# HG changeset patch # User al3x # Date 1065134468 0 # Node ID 13cbfe47f085517e4e5f37586da6246f21c72304 # Parent e35faf19f79fd165ed2beee32d570e7f05e7ad6d fixed codec specific data headers diff -r e35faf19f79f -r 13cbfe47f085 nut.c --- a/nut.c Thu Oct 02 22:33:55 2003 +0000 +++ b/nut.c Thu Oct 02 22:41:08 2003 +0000 @@ -1,5 +1,5 @@ /* - * NUT (de)muxer based on initial draft + * "NUT" Container Format muxer and demuxer (DRAFT-20031003) * Copyright (c) 2003 Alex Beregszaszi * * This library is free software; you can redistribute it and/or @@ -18,19 +18,18 @@ * * NUT DRAFT can be found in MPlayer CVS at DOCS/tech/mpcf.txt * - * Compatible with draft version 20030906 + * AND http://people.fsn.hu/~alex/nut/ (TeX, pdf, ps, dvi, ..) * */ /* * TODO: * - checksumming - * - correct timestamp handling + * - optimal timestamp handling * - index writing * - info and index packet reading support * - startcode searching for broken streams * - subpacket support - * - handling of codec specific headers */ //#define DEBUG 1 @@ -92,8 +91,7 @@ for (i = 0; i < len && i < maxlen; i++) data[i] = get_byte(bc); /* skip remaining bytes */ - for (; i < len; i++) - get_byte(bc); + url_fskip(bc, len-i); return 0; } @@ -106,8 +104,7 @@ for (i = 0; i < len && i <= 4; i++) val |= get_byte(bc) << (i * 8); /* skip remaining bytes */ - for (; i < len; i++) - get_byte(bc); + url_fskip(bc, len-i); return val; } @@ -474,8 +471,10 @@ get_v(bc); /* FIXME: msb timestamp base */ get_v(bc); /* shuffle type */ get_byte(bc); /* flags */ - - get_v(bc); /* FIXME: codec specific data headers */ + + /* codec specific data headers */ + while(get_v(bc) != 0) + url_fskip(bc, get_v(bc)); if (class == 0) /* VIDEO */ {