On Tue, Oct 27, 2015 at 11:28:32AM +0000, Lucas Andrade wrote:
> Here is the patch to backport it to release/2.8. To be fixed on 2.8.2.
> Anything else I should do?
> 
> ps. Sorry, that's my first time on opensource project, I'm a little
> confused that I needed to add it to the release branch.

>  hls.c |   31 +++++++++++++++----------------
>  1 file changed, 15 insertions(+), 16 deletions(-)
> 6b3c2cdc68e5fe0d9665a22a78837bca7d7b39b9  
> b3f3eab029eb429660fc1651a33dafe097cbac0e.patch
> From b3f3eab029eb429660fc1651a33dafe097cbac0e Mon Sep 17 00:00:00 2001
> From: Lucas de Andrade <lu...@mindello.com.br>
> Date: Mon, 26 Oct 2015 10:47:08 -0200
> Subject: [PATCH] Update Cookies response with Setcookie
> 
> Context cookies must be updated when a playlist response return Setcookie 
> header.
> Backported to release/2.8
> ---
>  libavformat/hls.c | 31 +++++++++++++++----------------
>  1 file changed, 15 insertions(+), 16 deletions(-)

this patch is against n2.8 not release/2.8

git checkout release/2.8
git cherry-pick ...
error: patch failed: libavformat/hls.c:962
error: libavformat/hls.c: patch does not apply
Patch failed at 0001 Update Cookies response with Setcookie
The copy of the patch that failed is found in:
   ffmpeg/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Frequently ignored answer#1 FFmpeg bugs should be sent to our bugtracker. User
questions about the command line tools should be sent to the ffmpeg-user ML.
And questions about how to use libav* should be sent to the libav-user ML.

Attachment: signature.asc
Description: Digital signature

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Reply via email to