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

libavformat option was not set for the second context.

Browse Source
This commit is contained in:
samsamsam
2019-01-22 04:10:08 +01:00
committed by Thilo Graf
parent a7e749dc67
commit 6ee43d0121
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libeplayer3-arm/container/container_ffmpeg.c
View File

@@ -100,7 +100,7 @@ static int32_t hasPlayThreadStarted = 0;
static AVFormatContext *avContextTab[IPTV_AV_CONTEXT_MAX_NUM] = {NULL, NULL}; static AVFormatContext *avContextTab[IPTV_AV_CONTEXT_MAX_NUM] = {NULL, NULL};
static int32_t use_custom_io[IPTV_AV_CONTEXT_MAX_NUM] = {0, 0}; static int32_t use_custom_io[IPTV_AV_CONTEXT_MAX_NUM] = {0, 0};
static AVDictionary *avio_opts = NULL; static AVDictionary *g_avio_opts = NULL;
static int64_t latestPts = 0; static int64_t latestPts = 0;
@@ -295,7 +295,7 @@ void flv2mpeg4_converter_set(const int32_t val)
int32_t ffmpeg_av_dict_set(const char *key, const char *value, int32_t flags) int32_t ffmpeg_av_dict_set(const char *key, const char *value, int32_t flags)
{ {
return av_dict_set(&avio_opts, key, value, flags); return av_dict_set(&g_avio_opts, key, value, flags);
} }
static char *Codec2Encoding(int32_t codec_id, int32_t media_type, uint8_t *extradata, int extradata_size, int profile __attribute__((unused)), int32_t *version) static char *Codec2Encoding(int32_t codec_id, int32_t media_type, uint8_t *extradata, int extradata_size, int profile __attribute__((unused)), int32_t *version)
@@ -1536,7 +1536,10 @@ int32_t container_ffmpeg_init_av_context(Context_t *context, char *filename, uin
} }
#endif #endif
AVDictionary *avio_opts = NULL;
AVDictionary **pavio_opts = NULL; AVDictionary **pavio_opts = NULL;
av_dict_copy(&avio_opts, g_avio_opts, 0);
eRTMPProtoImplType rtmpProtoImplType = RTMP_NONE; eRTMPProtoImplType rtmpProtoImplType = RTMP_NONE;
uint8_t numOfRTMPImpl = 0; uint8_t numOfRTMPImpl = 0;
if (0 == strncmp(filename, "ffrtmp", 6)) if (0 == strncmp(filename, "ffrtmp", 6))
@@ -2724,9 +2727,9 @@ static int32_t container_ffmpeg_stop(Context_t *context)
} }
} }
if (avio_opts != NULL) if (g_avio_opts != NULL)
{ {
av_dict_free(&avio_opts); av_dict_free(&g_avio_opts);
} }
avformat_network_deinit(); avformat_network_deinit();