Mercurial > mplayer.hg
annotate tremor/os.h @ 34757:da38eb1e2069
subassconvert: handle "\r\n" line ends
Previously the code converting text subtitles to ASS format converted newline
characters, and only those, to ASS "new line" markup. If the subtitles
contained "\r\n", the "\r" was thus left in the text. In previous libass
versions the "\r" was not visible, but in the current one it produces an empty
box. Improve the conversion to remove the "\r" in that case. Also treat a lone
"\r" as a newline.
Picked from mplayer2/3e0a2705
author | cboesch |
---|---|
date | Sat, 07 Apr 2012 11:17:09 +0000 |
parents | 5affa2074131 |
children |
rev | line source |
---|---|
14280 | 1 #ifndef _OS_H |
2 #define _OS_H | |
3 /******************************************************************** | |
4 * * | |
5 * THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. * | |
6 * * | |
19251
cd6b211be811
Replace tremor files that had old headers saying "ALL REDISTRIBUTION
uau
parents:
14280
diff
changeset
|
7 * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * |
cd6b211be811
Replace tremor files that had old headers saying "ALL REDISTRIBUTION
uau
parents:
14280
diff
changeset
|
8 * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * |
cd6b211be811
Replace tremor files that had old headers saying "ALL REDISTRIBUTION
uau
parents:
14280
diff
changeset
|
9 * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * |
cd6b211be811
Replace tremor files that had old headers saying "ALL REDISTRIBUTION
uau
parents:
14280
diff
changeset
|
10 * * |
14280 | 11 * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 * |
12 * BY THE Xiph.Org FOUNDATION http://www.xiph.org/ * | |
13 * * | |
14 ******************************************************************** | |
15 | |
16 function: #ifdef jail to whip a few platforms into the UNIX ideal. | |
17 | |
18 ********************************************************************/ | |
19 | |
34195
5affa2074131
build: fix compilation on Solaris due to missing alloca.h #include
diego
parents:
29264
diff
changeset
|
20 #include "config.h" |
14280 | 21 #include <math.h> |
22 #include "os_types.h" | |
23 | |
25847
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
19251
diff
changeset
|
24 #define STIN static inline |
14280 | 25 |
26 #ifndef M_PI | |
27 # define M_PI (3.1415926536f) | |
28 #endif | |
29 | |
30 #ifdef _WIN32 | |
31 # include <malloc.h> | |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
25847
diff
changeset
|
32 # define rint(x) (floor((x)+0.5f)) |
14280 | 33 # define NO_FLOAT_MATH_LIB |
34 # define FAST_HYPOT(a, b) sqrt((a)*(a) + (b)*(b)) | |
35 #endif | |
36 | |
37 #ifdef HAVE_ALLOCA_H | |
38 # include <alloca.h> | |
39 #endif | |
40 | |
41 #ifdef USE_MEMORY_H | |
42 # include <memory.h> | |
43 #endif | |
44 | |
45 #ifndef min | |
46 # define min(x,y) ((x)>(y)?(y):(x)) | |
47 #endif | |
48 | |
49 #ifndef max | |
50 # define max(x,y) ((x)<(y)?(y):(x)) | |
51 #endif | |
52 | |
53 #endif /* _OS_H */ |