get rid of most compiler warnings

Origin commit data
------------------
Branch: master
Commit: aca3da1f29
Author: martii <m4rtii@gmx.de>
Date: 2012-10-27 (Sat, 27 Oct 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2012-10-27 18:08:29 +02:00
parent f7baf5ea30
commit e6519f45fe
12 changed files with 87 additions and 3 deletions

View File

@@ -463,6 +463,31 @@ static void ASSThread(Context_t *context) {
* so there is hopefully installed an output callback
* in the subtitle output!
*/
#ifdef MARTII
SubtitleOut_t sub_out;
sub_out.type = eSub_Gfx;
if (ass_track->events)
{
/* fixme: check values */
sub_out.pts = ass_track->events->Start * 90.0;
sub_out.duration = ass_track->events->Duration / 1000.0;
} else
{
sub_out.pts = playPts;
sub_out.duration = 10.0;
}
sub_out.u.gfx.data = img->bitmap;
sub_out.u.gfx.Width = img->w;
sub_out.u.gfx.Height = img->h;
sub_out.u.gfx.x = img->dst_x;
sub_out.u.gfx.y = img->dst_y;
if(context && context->playback && context->playback->isPlaying &&
context->output && context->output->subtitle)
context->output->subtitle->Write(context, &sub_out);
#else
SubtitleOut_t out;
out.type = eSub_Gfx;
@@ -486,6 +511,7 @@ static void ASSThread(Context_t *context) {
if(context && context->playback && context->playback->isPlaying &&
context->output && context->output->subtitle)
context->output->subtitle->Write(context, &out);
#endif
}
}