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-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

avoid segfault

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 7467973099
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-07-14 (Sun, 14 Jul 2019)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2019-07-14 23:40:08 +02:00
committed by vanhofen
parent 9c57dfdcd0
commit db97f34102
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libeplayer3/container/container_ffmpeg.c
View File

@@ -1531,9 +1531,11 @@ int32_t container_ffmpeg_init_av_context(Context_t *context, char *filename, uin
int32_t err = 0; int32_t err = 0;
AVInputFormat *fmt = NULL; AVInputFormat *fmt = NULL;
avContextTab[AVIdx] = avformat_alloc_context(); avContextTab[AVIdx] = avformat_alloc_context();
avContextTab[AVIdx]->interrupt_callback.callback = interrupt_cb; if(avContextTab[AVIdx] != NULL)
avContextTab[AVIdx]->interrupt_callback.opaque = context->playback; {
avContextTab[AVIdx]->interrupt_callback.callback = interrupt_cb;
avContextTab[AVIdx]->interrupt_callback.opaque = context->playback;
}
#ifdef USE_CUSTOM_IO #ifdef USE_CUSTOM_IO
if (0 == strstr(filename, "://") || if (0 == strstr(filename, "://") ||
0 == strncmp(filename, "file://", 7)) 0 == strncmp(filename, "file://", 7))
@@ -1551,8 +1553,11 @@ int32_t container_ffmpeg_init_av_context(Context_t *context, char *filename, uin
avio_ctx = container_ffmpeg_get_avio_context(custom_io_tab[AVIdx], 4096); avio_ctx = container_ffmpeg_get_avio_context(custom_io_tab[AVIdx], 4096);
if (avio_ctx) if (avio_ctx)
{ {
avContextTab[AVIdx]->pb = avio_ctx; if(avContextTab[AVIdx])
use_custom_io[AVIdx] = 1; {
avContextTab[AVIdx]->pb = avio_ctx;
use_custom_io[AVIdx] = 1;
}
} }
else else
{ {
@@ -1793,7 +1798,7 @@ int32_t container_ffmpeg_init_av_context(Context_t *context, char *filename, uin
pavio_opts = &avio_opts; pavio_opts = &avio_opts;
if ((err = avformat_open_input(&avContextTab[AVIdx], filename, fmt, pavio_opts)) != 0) if (avContextTab[AVIdx] != NULL && ((err = avformat_open_input(&avContextTab[AVIdx], filename, fmt, pavio_opts)) != 0))
{ {
if (rtmp_proto_impl == 0 && //err == AVERROR_UNKNOWN && if (rtmp_proto_impl == 0 && //err == AVERROR_UNKNOWN &&
rtmpProtoImplType == RTMP_NATIVE && rtmpProtoImplType == RTMP_NATIVE &&
@@ -1820,10 +1825,11 @@ int32_t container_ffmpeg_init_av_context(Context_t *context, char *filename, uin
return cERR_CONTAINER_FFMPEG_OPEN; return cERR_CONTAINER_FFMPEG_OPEN;
} }
} }
if(avContextTab[AVIdx] != NULL)
avContextTab[AVIdx]->iformat->flags |= AVFMT_SEEK_TO_PTS; {
avContextTab[AVIdx]->flags = AVFMT_FLAG_GENPTS; avContextTab[AVIdx]->iformat->flags |= AVFMT_SEEK_TO_PTS;
avContextTab[AVIdx]->flags = AVFMT_FLAG_GENPTS;
}
printf("minimal Probe: %d\n", context->playback->noprobe); printf("minimal Probe: %d\n", context->playback->noprobe);
if (context->playback->noprobe) if (context->playback->noprobe)
@@ -1871,7 +1877,8 @@ int32_t container_ffmpeg_init_av_context(Context_t *context, char *filename, uin
} }
else if (progressive_playback) else if (progressive_playback)
{ {
avContextTab[AVIdx]->pb->read_packet = ffmpeg_read_wrapper; if(avContextTab[AVIdx] != NULL)
avContextTab[AVIdx]->pb->read_packet = ffmpeg_read_wrapper;
} }
} }
//for buffered io (end) //for buffered io (end)