[NUT-devel] [NUT] (ods15): r113 - in /trunk/libnut: demuxer.c muxer.c

[syncmail at mplayerhq.hu]

Author: ods15
Date: Sat Mar 25 09:04:38 2006
New Revision: 113

Log:
sync to spec, VLC stream_flags

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 25 09:04:38 2006
@@ -283,7 +283,6 @@
 	input_buffer_t itmp, * tmp = new_mem_buffer(&itmp);
 	stream_context_t * sc = &nut->sc[id];
 	int i, err = 0;
-	uint64_t a;
 
 	CHECK(get_header(nut->i, tmp));
 
@@ -297,8 +296,8 @@
 	GET_V(tmp, sc->msb_pts_shift);
 	GET_V(tmp, sc->max_pts_distance);
 	GET_V(tmp, sc->sh.decode_delay);
-	CHECK(get_bytes(tmp, 1, &a));
-	sc->sh.fixed_fps = a & 1;
+	GET_V(tmp, i); // stream_flags
+	sc->sh.fixed_fps = i & 1;
 	CHECK(get_vb(tmp, &sc->sh.codec_specific_len, &sc->sh.codec_specific));
 
 	switch (sc->sh.type) {

Modified: trunk/libnut/muxer.c
==============================================================================
--- trunk/libnut/muxer.c (original)
+++ trunk/libnut/muxer.c Sat Mar 25 09:04:38 2006
@@ -191,7 +191,7 @@
 	put_v(tmp, sc->msb_pts_shift);
 	put_v(tmp, sc->max_pts_distance);
 	put_v(tmp, sc->sh.decode_delay);
-	put_bytes(tmp, 1, sc->sh.fixed_fps ? 1 : 0);
+	put_v(tmp, sc->sh.fixed_fps ? 1 : 0);
 	put_vb(tmp, sc->sh.codec_specific_len, sc->sh.codec_specific);
 
 	switch (sc->sh.type) {