Mercurial > mplayer.hg

comparison spudec.c @ 31487:fd422d385a19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add #include for libvo/sub.h instead of duplicating sub_pos extern declaration.
author diego
date Thu, 24 Jun 2010 16:38:13 +0000
parents 0a182f029587
children 22272cbfaf28
comparison
equal deleted inserted replaced
31486:9b74773043d4 31487:fd422d385a19
35 #include <stdio.h> 35 #include <stdio.h>
36 #include <stdlib.h> 36 #include <stdlib.h>
37 #include <unistd.h> 37 #include <unistd.h>
38 #include <string.h> 38 #include <string.h>
39 #include <math.h> 39 #include <math.h>
40 #include "libvo/sub.h"
40 #include "libvo/video_out.h" 41 #include "libvo/video_out.h"
41 #include "spudec.h" 42 #include "spudec.h"
42 #include "vobsub.h" 43 #include "vobsub.h"
43 #include "libavutil/avutil.h" 44 #include "libavutil/avutil.h"
44 #include "libavutil/intreadwrite.h" 45 #include "libavutil/intreadwrite.h"
53 */ 54 */
54 55
55 int spu_aamode = 3; 56 int spu_aamode = 3;
56 int spu_alignment = -1; 57 int spu_alignment = -1;
57 float spu_gaussvar = 1.0; 58 float spu_gaussvar = 1.0;
58 extern int sub_pos;
59 59
60 typedef struct packet_t packet_t; 60 typedef struct packet_t packet_t;
61 struct packet_t { 61 struct packet_t {
62 unsigned char *packet; 62 unsigned char *packet;
63 unsigned int palette[4]; 63 unsigned int palette[4];