Mercurial > mplayer.hg
annotate libmpeg2/attributes.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 | da2271c341ee |
children |
rev | line source |
---|---|
1 | 1 /* |
2 * attributes.h | |
12932 | 3 * Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org> |
9852 | 4 * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> |
1 | 5 * |
6 * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. | |
9852 | 7 * See http://libmpeg2.sourceforge.net/ for updates. |
1 | 8 * |
9 * mpeg2dec is free software; you can redistribute it and/or modify | |
10 * it under the terms of the GNU General Public License as published by | |
11 * the Free Software Foundation; either version 2 of the License, or | |
12 * (at your option) any later version. | |
13 * | |
14 * mpeg2dec is distributed in the hope that it will be useful, | |
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 * GNU General Public License for more details. | |
18 * | |
19 * You should have received a copy of the GNU General Public License | |
20 * along with this program; if not, write to the Free Software | |
21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
22 */ | |
23 | |
27572 | 24 #ifndef LIBMPEG2_ATTRIBUTES_H |
25 #define LIBMPEG2_ATTRIBUTES_H | |
26 | |
36 | 27 /* use gcc attribs to align critical data structures */ |
1 | 28 #ifdef ATTRIBUTE_ALIGNED_MAX |
9852 | 29 #define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align))) |
1 | 30 #else |
26043
ad048f993f66
#define ATTRIBUTE_ALIGNED_MAX in config.h instead of hardcoding it.
diego
parents:
21526
diff
changeset
|
31 #define ATTR_ALIGN(align) |
1 | 32 #endif |
9852 | 33 |
34 #ifdef HAVE_BUILTIN_EXPECT | |
35 #define likely(x) __builtin_expect ((x) != 0, 1) | |
36 #define unlikely(x) __builtin_expect ((x) != 0, 0) | |
37 #else | |
38 #define likely(x) (x) | |
39 #define unlikely(x) (x) | |
40 #endif | |
27572 | 41 |
42 #endif /* LIBMPEG2_ATTRIBUTES_H */ |