Mercurial > mplayer.hg

annotate debian/mplayer.mime @ 34757:da38eb1e2069

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
31833
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
1 application/x-ogg; /usr/bin/mplayer %s; description="OggVorbis Audio"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
2 application/ogg; /usr/bin/mplayer %s; description="OggVorbis Audio"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
3 audio/mpeg; /usr/bin/mplayer %s; description="MPEG Audio Format"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
4 audio/x-mpegurl; /usr/bin/mplayer %s; description="Icecast Playlists"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
5 audio/x-ms-wax; /usr/bin/mplayer %s; description="Audio Format"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
6 audio/x-ms-wma; /usr/bin/mplayer %s; description="Audio Format"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
7 audio/x-pls; /usr/bin/mplayer %s; description="MP3 ShoutCast/IceCast Playlist"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
8 audio/x-scpls; /usr/bin/mplayer %s; description="Shoutcast Playlists"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
9 audio/x-wav; /usr/bin/mplayer %s; description="Waveform Microsoft Wave/RIFF"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
10 video/mpeg; /usr/bin/mplayer %s; description="MPEG Video Format"; test=test -n "$DISPLAY"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
11 video/quicktime; /usr/bin/mplayer %s; description="Apple Quicktime Video"; test=test -n "$DISPLAY"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
12 video/x-mpeg2; /usr/bin/mplayer %s; description="MPEG Video"; test=test -n "$DISPLAY"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
13 video/x-mpeg; /usr/bin/mplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
14 video/mpeg; /usr/bin/mplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
15 video/x-ms-afs; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
16 video/x-ms-asf; /usr/bin/mplayer %s; description="MS ASF video"; test=test -n "$DISPLAY"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
17 video/x-msvideo; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
18 video/x-ms-wma; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
19 video/x-ms-wmv; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
20 video/x-ms-wmx; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
c9f9a077d760 Add new debian packaging based on official distro packages
siretart
parents:
diff changeset
21 video/x-ms-wvx; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"