On Thu, Jun 04, 2015 at 01:33:35PM +0530, Anshul wrote: > Hello > > New patch to remove merge conflicts. > > -Anshul
> hlsenc.c | 202 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 192 insertions(+), 10 deletions(-) > 3bf30e70251b47f644cc999e23c0b237e9952c08 0001-Add-WebVtt-support-in-hls.patch > From 4433686fdc62f9aebe23937b51b641febacfa2fe Mon Sep 17 00:00:00 2001 > From: Anshul Maheshwari <er.anshul.maheshw...@gmail.com> > Date: Thu, 4 Jun 2015 13:25:52 +0530 > Subject: [PATCH] Add WebVtt support in hls > > Signed-off-by: Anshul Maheshwari <er.anshul.maheshw...@gmail.com> applied thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Let us carefully observe those good qualities wherein our enemies excel us and endeavor to excel them, by avoiding what is faulty, and imitating what is excellent in them. -- Plutarch
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
