eplayer3: fix playback termination handling

This commit is contained in:
martii
2014-03-09 14:16:45 +01:00
parent 8231b7f0db
commit 56b3c7e01d
3 changed files with 5 additions and 3 deletions

View File

@@ -799,7 +799,7 @@ static void FFMPEGThread(Context_t * context)
avcodec_free_frame(&decoded_frame);
if (context->playback)
context->playback->abortRequested = 1;
context->playback->abortPlayback = 1;
hasPlayThreadStarted = 0;
ffmpeg_printf(10, "terminating\n");
@@ -813,7 +813,7 @@ static int terminating = 0;
static int interrupt_cb(void *ctx)
{
PlaybackHandler_t *p = (PlaybackHandler_t *) ctx;
return p->abortRequested;
return p->abortPlayback | p->abortRequested;
}
static void log_callback(void *ptr __attribute__ ((unused)), int lvl __attribute__ ((unused)), const char *format, va_list ap)