0
0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00

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
This commit is contained in:
bertrand 2001-05-21 13:04:34 +00:00
parent 65f6735582
commit d2a3dbc094
2 changed files with 6 additions and 4 deletions

View File

@ -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 -------------------

View File

@ -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 --------