Mercurial > mplayer.hg

comparison demux_asf.c @ 848:738dc5a2bb39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b8cecdc0c67f
children 3bcc435cd5a2
comparison
equal deleted inserted replaced
847:df0f1ace7a33 848:738dc5a2bb39
6 extern int verbose; // defined in mplayer.c 6 extern int verbose; // defined in mplayer.c
7 7
8 #include "stream.h" 8 #include "stream.h"
9 #include "demuxer.h" 9 #include "demuxer.h"
10 10
11 #include "asf.h"
12 11
13 // defined at asfheader.c: 12 // defined at asfheader.c:
14 extern unsigned char* asf_packet; 13 extern unsigned char* asf_packet;
15 extern int asf_scrambling_h; 14 extern int asf_scrambling_h;
16 extern int asf_scrambling_w; 15 extern int asf_scrambling_w;
25 //static float avi_video_pts=0; 24 //static float avi_video_pts=0;
26 25
27 //static int skip_video_frames=0; 26 //static int skip_video_frames=0;
28 27
29 //BB: Moved to asf.h --------- FROM HERE -------- 28 //BB: Moved to asf.h --------- FROM HERE --------
30 #ifdef 0 29 #ifndef STREAMING
31 typedef struct __attribute__((packed)) { 30 typedef struct __attribute__((packed)) {
32 unsigned char streamno; 31 unsigned char streamno;
33 unsigned char seq; 32 unsigned char seq;
34 unsigned long x; 33 unsigned long x;
35 unsigned char flag; 34 unsigned char flag;
36 } ASF_segmhdr_t; 35 } ASF_segmhdr_t;
36 #else
37 #include "asf.h"
37 #endif 38 #endif
38 //BB: Moved to asf.h --------- TO HERE -------- 39 //BB: Moved to asf.h --------- TO HERE --------
39 40
40 static void asf_descrambling(unsigned char *src,int len){ 41 static void asf_descrambling(unsigned char *src,int len){
41 unsigned char *dst=malloc(len); 42 unsigned char *dst=malloc(len);