From 0afe5b26a6bc455c6d37197b67ec06e589e76232 Mon Sep 17 00:00:00 2001 From: martii Date: Sat, 16 Mar 2013 19:43:25 +0100 Subject: [PATCH] libeplayer3/container_ffmpeg: handle .wtv extensions, too Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/ecd0dac59530689b0597234ec47853c56730165b Author: martii Date: 2013-03-16 (Sat, 16 Mar 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/container/container_ffmpeg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libeplayer3/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c index 45460ba..b3646fd 100644 --- a/libeplayer3/container/container_ffmpeg.c +++ b/libeplayer3/container/container_ffmpeg.c @@ -2774,7 +2774,11 @@ static int Command(void *_context, ContainerCmd_t command, void * argument) return ret; } +#ifdef MARTII +static char *FFMPEG_Capabilities[] = {"avi", "mkv", "mp4", "ts", "mov", "flv", "flac", "mp3", "mpg", "m2ts", "vob", "wmv","wma", "asf", "mp2", "m4v", "m4a", "divx", "dat", "mpeg", "trp", "mts", "vdr", "ogg", "wav", "wtv", NULL }; +#else static char *FFMPEG_Capabilities[] = {"avi", "mkv", "mp4", "ts", "mov", "flv", "flac", "mp3", "mpg", "m2ts", "vob", "wmv","wma", "asf", "mp2", "m4v", "m4a", "divx", "dat", "mpeg", "trp", "mts", "vdr", "ogg", "wav", NULL }; +#endif Container_t FFMPEGContainer = { "FFMPEG",