diff --git a/libeplayer3-arm/container/container_ffmpeg.c b/libeplayer3-arm/container/container_ffmpeg.c
index 074155c..4692b4e 100644
--- a/libeplayer3-arm/container/container_ffmpeg.c
+++ b/libeplayer3-arm/container/container_ffmpeg.c
@@ -126,6 +126,7 @@ static int32_t container_ffmpeg_seek(Context_t *context, int64_t sec, uint8_t ab
 static int32_t container_ffmpeg_get_length(Context_t *context, int64_t *length);
 static int64_t calcPts(uint32_t avContextIdx, AVStream *stream, int64_t pts);
 static int64_t doCalcPts(int64_t start_time, const AVRational time_base, int64_t pts);
+static int32_t container_ffmpeg_stop(Context_t *context);
 
 /* Progressive playback means that we play local file
  * but this local file can grows up, for example
@@ -1352,6 +1353,11 @@ static void FFMPEGThread(Context_t *context)
 	do_seek_target_seconds = 0;
 	PlaybackDieNow(1);
 
+	if(context && context->playback)
+	{
+		container_ffmpeg_stop(context);
+	}
+
 	ffmpeg_printf(10, "terminating\n");
 }
 
@@ -1533,8 +1539,7 @@ int32_t container_ffmpeg_init_av_context(Context_t *context, char *filename, uin
 	    0 == strncmp(filename, "file://", 7))
 	{
 		AVIOContext *avio_ctx = NULL;
-		if(custom_io_tab[AVIdx] == NULL)//workaround for double malloc if container_ffmpeg_stop is not called after file play to end
-			custom_io_tab[AVIdx] = malloc(sizeof(CustomIOCtx_t));
+		custom_io_tab[AVIdx] = malloc(sizeof(CustomIOCtx_t));
 
 		memset(custom_io_tab[AVIdx], 0x00, sizeof(CustomIOCtx_t));