Mercurial > mplayer.hg

comparison mplayer.c @ 19401:c0c3a2f8bb32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add subdata to ass_track conversion for external subtitles.
author eugeni
date Tue, 15 Aug 2006 19:25:46 +0000
parents 64f9a6ce71e1
children e451718727d9
comparison
equal deleted inserted replaced
19400:0310c3310360 19401:c0c3a2f8bb32
812 812
813 subd = sub_read_file(filename, fps); 813 subd = sub_read_file(filename, fps);
814 #ifdef USE_ASS 814 #ifdef USE_ASS
815 if (ass_enabled) 815 if (ass_enabled)
816 asst = ass_read_file(filename); 816 asst = ass_read_file(filename);
817 if (ass_enabled && !asst)
818 asst = ass_read_subdata(subd, fps);
819
817 if (!asst && !subd && !silent) 820 if (!asst && !subd && !silent)
818 #else 821 #else
819 if(!subd && !silent) 822 if(!subd && !silent)
820 #endif 823 #endif
821 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantLoadSub, filename); 824 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantLoadSub, filename);