Mercurial > mplayer.hg
annotate libmpcodecs/ve.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 | af9ef007bec6 |
children |
rev | line source |
---|---|
31456
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
1 /* |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
2 * This file is part of MPlayer. |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
3 * |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
7 * (at your option) any later version. |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
8 * |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
12 * GNU General Public License for more details. |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
13 * |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
17 */ |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
18 |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
19 #ifndef MPLAYER_VE_H |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
20 #define MPLAYER_VE_H |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
21 |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
22 #include "m_option.h" |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
23 |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
24 extern const m_option_t lavcopts_conf[]; |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
25 extern const m_option_t vfwopts_conf[]; |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
26 extern const m_option_t xvidencopts_conf[]; |
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
27 |
32017 | 28 extern char *lavc_param_acodec; |
29 extern char *lavc_param_audio_avopt; | |
30 extern int lavc_param_abitrate; | |
31 extern int lavc_param_atag; | |
32 extern int lavc_param_audio_global_header; | |
33 | |
32476 | 34 int parse_forced_key_frames(const m_option_t *opt, const char *arg); |
35 int is_forced_key_frame(double pts); | |
36 | |
31456
99800c647f77
Add header file for video encoder extern variable declarations.
diego
parents:
diff
changeset
|
37 #endif /* MPLAYER_VE_H */ |