From e693b26204d71bbf91234da6fef14ed7862fa50e Mon Sep 17 00:00:00 2001 From: martii Date: Thu, 21 Nov 2013 18:18:13 +0100 Subject: [PATCH] libeplayer3/ffmpeg: don't initialize container if context already exists Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/df8103d5bb6ebb862c09a09cb2a687e0b1959632 Author: martii Date: 2013-11-21 (Thu, 21 Nov 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/container/container_ffmpeg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libeplayer3/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c index 9920611..98b353c 100644 --- a/libeplayer3/container/container_ffmpeg.c +++ b/libeplayer3/container/container_ffmpeg.c @@ -1677,6 +1677,8 @@ static int Command(void *_context, ContainerCmd_t command, void * argument) if (command != CONTAINER_INIT && !avContext) return cERR_CONTAINER_FFMPEG_ERR; + if (command == CONTAINER_INIT && avContext) + return cERR_CONTAINER_FFMPEG_ERR; switch(command) { case CONTAINER_INIT: {