[Mplayer-cvslog] CVS: main demux_asf.c,1.7,1.8 asfheader.c,1.14,1.15

[Bertrand Baudet]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv29827

Modified Files:
	demux_asf.c asfheader.c 
Log Message:
Changed some #ifdef to include modify ASF structs definition
when STREAMING is defined.


Index: demux_asf.c
===================================================================
RCS file: /cvsroot/mplayer/main/demux_asf.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** demux_asf.c	2001/05/18 16:14:06	1.7
--- demux_asf.c	2001/05/21 13:04:34	1.8
***************
*** 9,13 ****
  #include "demuxer.h"
  
- #include "asf.h"
  
  // defined at asfheader.c:
--- 9,12 ----
***************
*** 28,32 ****
  
  //BB: Moved to asf.h --------- FROM HERE --------
! #ifdef 0
  typedef struct __attribute__((packed)) {
    unsigned char streamno;
--- 27,31 ----
  
  //BB: Moved to asf.h --------- FROM HERE --------
! #ifndef STREAMING
  typedef struct __attribute__((packed)) {
    unsigned char streamno;
***************
*** 35,38 ****
--- 34,39 ----
    unsigned char flag;
  } ASF_segmhdr_t;
+ #else
+ #include "asf.h"
  #endif
  //BB: Moved to asf.h --------- TO HERE --------

Index: asfheader.c
===================================================================
RCS file: /cvsroot/mplayer/main/asfheader.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** asfheader.c	2001/05/20 13:24:41	1.14
--- asfheader.c	2001/05/21 13:04:34	1.15
***************
*** 17,24 ****
  #include "stheader.h"
  
- #include "asf.h"
  
  // BB: Moved to asf.h  --------------------- FROM HERE -------------------
! #ifdef 0
  typedef struct __attribute__((packed)) {
    unsigned char guid[16];
--- 17,23 ----
  #include "stheader.h"
  
  
  // BB: Moved to asf.h  --------------------- FROM HERE -------------------
! #ifndef STREAMING
  typedef struct __attribute__((packed)) {
    unsigned char guid[16];
***************
*** 65,68 ****
--- 64,69 ----
    unsigned short rating_size;
  } ASF_content_description_t;
+ #else
+ #include "asf.h"
  #endif
  // BB: Moved to asf.h  --------------------- TO HERE -------------------


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog