Mercurial > mplayer.hg
annotate tremor/registry.c @ 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 | cd6b211be811 |
children |
rev | line source |
---|---|
14280 | 1 /******************************************************************** |
2 * * | |
3 * THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. * | |
4 * * | |
19251
cd6b211be811
Replace tremor files that had old headers saying "ALL REDISTRIBUTION
uau
parents:
14280
diff
changeset
|
5 * 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
|
6 * 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
|
7 * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * |
cd6b211be811
Replace tremor files that had old headers saying "ALL REDISTRIBUTION
uau
parents:
14280
diff
changeset
|
8 * * |
14280 | 9 * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 * |
10 * BY THE Xiph.Org FOUNDATION http://www.xiph.org/ * | |
11 * * | |
12 ******************************************************************** | |
13 | |
14 function: registry for floor, res backends and channel mappings | |
15 | |
16 ********************************************************************/ | |
17 | |
18 #include "ivorbiscodec.h" | |
19 #include "codec_internal.h" | |
20 #include "registry.h" | |
21 #include "misc.h" | |
22 | |
23 | |
24 /* seems like major overkill now; the backend numbers will grow into | |
25 the infrastructure soon enough */ | |
26 | |
27 extern vorbis_func_floor floor0_exportbundle; | |
28 extern vorbis_func_floor floor1_exportbundle; | |
29 extern vorbis_func_residue residue0_exportbundle; | |
30 extern vorbis_func_residue residue1_exportbundle; | |
31 extern vorbis_func_residue residue2_exportbundle; | |
32 extern vorbis_func_mapping mapping0_exportbundle; | |
33 | |
34 vorbis_func_floor *_floor_P[]={ | |
35 &floor0_exportbundle, | |
36 &floor1_exportbundle, | |
37 }; | |
38 | |
39 vorbis_func_residue *_residue_P[]={ | |
40 &residue0_exportbundle, | |
41 &residue1_exportbundle, | |
42 &residue2_exportbundle, | |
43 }; | |
44 | |
45 vorbis_func_mapping *_mapping_P[]={ | |
46 &mapping0_exportbundle, | |
47 }; | |
48 | |
49 | |
50 |