diff options
| author |  bertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-05-21 13:04:34 +0000 |
|---|---|---|
| committer | bertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-05-21 13:04:34 +0000 |
| commit | d2a3dbc094065d483dca3a0a17ccf35932ae93d2 (patch) | |
| tree | e29185bcd238a9fd36d6c68582d16e90d45a4120 | |
| parent | 65f67355823d988aa459a279c2e31b44df30ba8d (diff) | |
Changed some #ifdef to include modify ASF structs definition
when STREAMING is defined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@849 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | asfheader.c | 5 | ||||
| -rw-r--r-- | demux_asf.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/asfheader.c b/asfheader.c index a28eb80e65..a1417d4ad2 100644 --- a/asfheader.c +++ b/asfheader.c @@ -16,10 +16,9 @@ extern int verbose; // defined in mplayer.c #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 @@ typedef struct __attribute__((packed)) { unsigned short comment_size; unsigned short rating_size; } ASF_content_description_t; +#else +#include "asf.h" #endif // BB: Moved to asf.h --------------------- TO HERE ------------------- diff --git a/demux_asf.c b/demux_asf.c index c63b3803d5..e7550a5695 100644 --- a/demux_asf.c +++ b/demux_asf.c @@ -8,7 +8,6 @@ extern int verbose; // defined in mplayer.c #include "stream.h" #include "demuxer.h" -#include "asf.h" // defined at asfheader.c: extern unsigned char* asf_packet; @@ -27,13 +26,15 @@ extern int asf_packetsize; //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 -------- |