mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-27 15:33:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3: fix segv

Browse Source
This commit is contained in:
martii
2013-04-10 20:41:44 +02:00
parent e9be2bed37
commit 5025a6e645
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libeplayer3/container/container_ffmpeg.c
View File

@@ -1530,6 +1530,7 @@ static void ffmpeg_buf_free()
/* Container part for ffmpeg */ /* Container part for ffmpeg */
/* **************************** */ /* **************************** */
#ifdef MARTII #ifdef MARTII
static int terminating = 0;
static int interrupt_cb(void *ctx) static int interrupt_cb(void *ctx)
{ {
PlaybackHandler_t *p = (PlaybackHandler_t *)ctx; PlaybackHandler_t *p = (PlaybackHandler_t *)ctx;
@@ -1681,11 +1682,17 @@ int container_ffmpeg_init(Context_t *context, char * filename)
//for buffered io (end) //for buffered io (end)
#endif #endif
#ifdef MARTII #ifdef MARTII
terminating = 0;
latestPts = 0;
isContainerRunning = 1;
return container_ffmpeg_update_tracks(context, filename); return container_ffmpeg_update_tracks(context, filename);
} }
int container_ffmpeg_update_tracks(Context_t *context, char *filename) int container_ffmpeg_update_tracks(Context_t *context, char *filename)
{ {
if (terminating)
return cERR_CONTAINER_FFMPEG_NO_ERROR;
int n; int n;
if (context->manager->audio) if (context->manager->audio)
@@ -2109,9 +2116,11 @@ int container_ffmpeg_update_tracks(Context_t *context, char *filename)
} /* for */ } /* for */
#ifndef MARTII
/* init */ /* init */
latestPts = 0; latestPts = 0;
isContainerRunning = 1; isContainerRunning = 1;
#endif
releaseMutex(FILENAME, __FUNCTION__,__LINE__); releaseMutex(FILENAME, __FUNCTION__,__LINE__);
@@ -2211,6 +2220,9 @@ static int container_ffmpeg_stop(Context_t *context) {
} }
hasPlayThreadStarted = 0; hasPlayThreadStarted = 0;
#ifdef MARTII
terminating = 1;
#endif
getMutex(FILENAME, __FUNCTION__,__LINE__); getMutex(FILENAME, __FUNCTION__,__LINE__);