Mercurial > mplayer.hg

annotate loader/wine/pshpack4.h @ 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 32725ca88fed
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26045
a8ea87c71d18 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25548
diff changeset
1 #ifndef MPLAYER_PSHPACK_H
a8ea87c71d18 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25548
diff changeset
2 #define MPLAYER_PSHPACK_H 4
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4 #if defined(__GNUC__) || defined(__SUNPRO_CC)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
5 //#pragma pack(4)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
6 #elif defined(__SUNPRO_C)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
7 //#pragma pack()
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
8 #elif !defined(RC_INVOKED)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
9 #error "4 as alignment isn't supported by the compiler"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
10 #endif /* defined(__GNUC__) || defined(__SUNPRO_CC) ; !defined(RC_INVOKED) */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
11
26045
a8ea87c71d18 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25548
diff changeset
12 #else /* MPLAYER_PSHPACK_H */
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
13 #error "Nested pushing of alignment isn't supported by the compiler"
26045
a8ea87c71d18 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25548
diff changeset
14 #endif /* MPLAYER_PSHPACK_H */