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