annotate libmpcodecs/ve_x264.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 e4c7703dd901
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30949
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
1 /*
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
2 * This file is part of MPlayer.
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
3 *
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
7 * (at your option) any later version.
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
8 *
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
12 * GNU General Public License for more details.
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
13 *
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
14 * You should have received a copy of the GNU General Public License along
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
17 */
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
18
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
19 #ifndef MPLAYER_X264_H
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
20 #define MPLAYER_X264_H
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
21
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
22 #include "m_option.h"
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
23
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
24 void x264enc_set_param(const m_option_t* opt, char* arg);
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
25
e4c7703dd901 Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff changeset
26 #endif /* MPLAYER_X264_H */