| commit | 43c3a07f5812bfe32b1d65cced7f4d07213e1c72 | |
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Sat, 16 Jan 2010 15:38:58 +0000 (16 17:38 +0200) | ||
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Sat, 16 Jan 2010 17:40:45 +0000 (16 19:40 +0200) | ||
| tree | 39802fb5ff9e0f3b849c333700dbc8d4b81797b8 | treesnapshot (tar.gz zip) |
| parent | 6ead3e936b8344d13c56567142d95cff0d4d8c90 | commitdiff |
subtitles: avoid running subreader.c parser when using libass
When loading external subtitle files, the code always tried parsing
the file with subreader.c sub_read_file() first, even if libass was
then used to parse and render the file (the results of the first
parsing would be ignored in that case). This could cause problems like
unnecessary error messages. Change the code to try libass parsing
first if enabled, and skip subreader.c parsing if that succeeds.
When loading external subtitle files, the code always tried parsing
the file with subreader.c sub_read_file() first, even if libass was
then used to parse and render the file (the results of the first
parsing would be ignored in that case). This could cause problems like
unnecessary error messages. Change the code to try libass parsing
first if enabled, and skip subreader.c parsing if that succeeds.
| mplayer.c | diffblobblamehistory |