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

libeplayer3: add callback to abort avformat_open_input

Browse Source 
Origin commit data
------------------
Branch: master
Commit: d02696233c
Author: martii <m4rtii@gmx.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-03-10 15:44:30 +01:00
parent c992bd376c
commit 4e9f1ff475
5 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libeplayer3/container/container_ffmpeg.c
View File

@@ -1508,6 +1508,13 @@ static void ffmpeg_buf_free()
/* **************************** */
/* Container part for ffmpeg */
/* **************************** */
#ifdef MARTII
static int interrupt_cb(void *ctx)
{
PlaybackHandler_t *p = (PlaybackHandler_t *)ctx;
return p->abortRequested;
}
#endif
int container_ffmpeg_init(Context_t *context, char * filename)
{
@@ -1543,6 +1550,12 @@ int container_ffmpeg_init(Context_t *context, char * filename)
#ifdef MARTII //TDT
avformat_network_init();
#endif
#ifdef MARTII
context->playback->abortRequested = 0;
avContext = avformat_alloc_context();
avContext->interrupt_callback.callback = interrupt_cb;
avContext->interrupt_callback.opaque = context->playback;
#endif
#if LIBAVCODEC_VERSION_MAJOR < 54
if ((err = av_open_input_file(&avContext, filename, NULL, 0, NULL)) != 0) {
@@ -2139,6 +2152,7 @@ static int container_ffmpeg_stop(Context_t *context) {
getMutex(FILENAME, __FUNCTION__,__LINE__);
#ifdef MARTII
if (avContext)
avformat_close_input(&avContext);
#else
if (avContext != NULL) {