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

[syncmail at mplayerhq.hu]

Author: ods15
Date: Fri Mar 31 02:51:54 2006
New Revision: 115

Log:
100l use of old flag defines

Modified:
    trunk/libnut/demuxer.c
    trunk/libnut/muxer.c
    trunk/libnut/priv.h

Modified: trunk/libnut/demuxer.c
==============================================================================
--- trunk/libnut/demuxer.c (original)
+++ trunk/libnut/demuxer.c Fri Mar 31 02:51:54 2006
@@ -263,7 +263,7 @@
 
 		for(j = 0; j < count && i < 256; j++, i++) {
 			if (i == 'N') {
-				nut->ft[i].flags = INVALID_FLAG;
+				nut->ft[i].flags = FLAG_INVALID;
 				j--;
 				continue;
 			}

Modified: trunk/libnut/muxer.c
==============================================================================
--- trunk/libnut/muxer.c (original)
+++ trunk/libnut/muxer.c Fri Mar 31 02:51:54 2006
@@ -404,6 +404,8 @@
 		int len = 1; // frame code
 		int flags = nut->ft[i].flags;
 		if (flags & FLAG_INVALID) continue;
+		fprintf(stderr, "%d\n", i);
+		if (nut->ft[i].stream_plus1) { len = 2; }
 		if (nut->ft[i].stream_plus1 && nut->ft[i].stream_plus1 - 1 != fd->stream) continue;
 		if (nut->ft[i].pts_delta && nut->ft[i].pts_delta != pts_delta) continue;
 		if (flags & FLAG_CODED) {
@@ -512,7 +514,7 @@
 
 		for(j = 0; j < count && i < 256; j++, i++) {
 			if (i == 'N') {
-				nut->ft[i].flags = INVALID_FLAG;
+				nut->ft[i].flags = FLAG_INVALID;
 				j--;
 				continue;
 			}

Modified: trunk/libnut/priv.h
==============================================================================
--- trunk/libnut/priv.h (original)
+++ trunk/libnut/priv.h Fri Mar 31 02:51:54 2006
@@ -23,9 +23,6 @@
 #define FLAG_CHECKSUM   64
 #define FLAG_CODED    4096
 #define FLAG_INVALID  8192
-
-#define STREAM_CODED_FLAG 2
-#define INVALID_FLAG 4
 
 #define PREALLOC_SIZE 4096