Mercurial > mplayer.hg
changeset 848:738dc5a2bb39
Changed some #ifdef to include modify ASF structs definition
when STREAMING is defined.
| author | bertrand |
|---|---|
| date | Mon, 21 May 2001 13:04:34 +0000 |
| parents | df0f1ace7a33 |
| children | 0d4f64301c21 |
| files | asfheader.c demux_asf.c |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/asfheader.c Mon May 21 12:43:10 2001 +0000 +++ b/asfheader.c Mon May 21 13:04:34 2001 +0000 @@ -16,10 +16,9 @@ #include "codec-cfg.h" #include "stheader.h" -#include "asf.h" // BB: Moved to asf.h --------------------- FROM HERE ------------------- -#ifdef 0 +#ifndef STREAMING typedef struct __attribute__((packed)) { unsigned char guid[16]; unsigned long long size; @@ -64,6 +63,8 @@ unsigned short comment_size; unsigned short rating_size; } ASF_content_description_t; +#else +#include "asf.h" #endif // BB: Moved to asf.h --------------------- TO HERE -------------------
--- a/demux_asf.c Mon May 21 12:43:10 2001 +0000 +++ b/demux_asf.c Mon May 21 13:04:34 2001 +0000 @@ -8,7 +8,6 @@ #include "stream.h" #include "demuxer.h" -#include "asf.h" // defined at asfheader.c: extern unsigned char* asf_packet; @@ -27,13 +26,15 @@ //static int skip_video_frames=0; //BB: Moved to asf.h --------- FROM HERE -------- -#ifdef 0 +#ifndef STREAMING typedef struct __attribute__((packed)) { unsigned char streamno; unsigned char seq; unsigned long x; unsigned char flag; } ASF_segmhdr_t; +#else +#include "asf.h" #endif //BB: Moved to asf.h --------- TO HERE --------