Mercurial > mplayer.hg
view debian/mplayer.mime @ 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 | c9f9a077d760 |
children | 6c750d212873 |
line wrap: on
line source
application/x-ogg; /usr/bin/mplayer %s; description="OggVorbis Audio" application/ogg; /usr/bin/mplayer %s; description="OggVorbis Audio" audio/mpeg; /usr/bin/mplayer %s; description="MPEG Audio Format" audio/x-mpegurl; /usr/bin/mplayer %s; description="Icecast Playlists" audio/x-ms-wax; /usr/bin/mplayer %s; description="Audio Format" audio/x-ms-wma; /usr/bin/mplayer %s; description="Audio Format" audio/x-pls; /usr/bin/mplayer %s; description="MP3 ShoutCast/IceCast Playlist" audio/x-scpls; /usr/bin/mplayer %s; description="Shoutcast Playlists" audio/x-wav; /usr/bin/mplayer %s; description="Waveform Microsoft Wave/RIFF" video/mpeg; /usr/bin/mplayer %s; description="MPEG Video Format"; test=test -n "$DISPLAY" video/quicktime; /usr/bin/mplayer %s; description="Apple Quicktime Video"; test=test -n "$DISPLAY" video/x-mpeg2; /usr/bin/mplayer %s; description="MPEG Video"; test=test -n "$DISPLAY" video/x-mpeg; /usr/bin/mplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY" video/mpeg; /usr/bin/mplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY" video/x-ms-afs; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" video/x-ms-asf; /usr/bin/mplayer %s; description="MS ASF video"; test=test -n "$DISPLAY" video/x-msvideo; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" video/x-ms-wma; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" video/x-ms-wmv; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" video/x-ms-wmx; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" video/x-ms-wvx; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"