[FFmpeg-devel] [PATCH] Backport hls and cookie fixes to the 2.6 branch

Michael Niedermayer michaelni at gmx.at
Thu Mar 26 13:59:37 CET 2015


On Thu, Mar 26, 2015 at 08:22:08PM +1100, Micah Galizia wrote:
> Hi,
> 
> I'd like to backport my fixes from the main branch. Patch attached --
> original commits were:
> 
> c59654d67d1afde3fac24021ef0fd9d18cf38455
> fca085187940a169b7a43d096009f7dac315f9ac
> 7859618affe574c9de7f240d2ddc016f917c37bd
> 
> Thanks in advance!
> -- 
> "The mark of an immature man is that he wants to die nobly for a
> cause, while the mark of the mature man is that he wants to live
> humbly for one."   --W. Stekel

>  hls.c  |   25 +++++++++++++------------
>  http.c |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
>  2 files changed, 65 insertions(+), 25 deletions(-)
> 11197b5f216af843a46766e0697727b89e930870  0001-backport-hls-and-cookie-fixes.patch
> From dec8b5b1033c63906e7b1e783bd50a2be287d8d5 Mon Sep 17 00:00:00 2001
> From: Micah Galizia <micahgalizia at gmail.com>
> Date: Thu, 26 Mar 2015 20:16:34 +1100
> Subject: [PATCH] backport hls and cookie fixes

backports should be one commit for each commit backported and
be made with
git cherry-pick -s -x

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Avoid a single point of failure, be that a person or equipment.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150326/73db6289/attachment.asc>


More information about the ffmpeg-devel mailing list