On Sat, May 06, 2017 at 02:28:10PM -0400, Micah Galizia wrote:
> On 2017-05-05 09:28 PM, wm4 wrote:
> >On Fri, 5 May 2017 20:55:05 -0400
> >Micah Galizia <micahgali...@gmail.com> wrote:
> >
> >>Signed-off-by: Micah Galizia <micahgali...@gmail.com>
> >>---
> >> libavformat/hls.c | 12 ++++++++++--
> >> 1 file changed, 10 insertions(+), 2 deletions(-)
> >>
> >>diff --git a/libavformat/hls.c b/libavformat/hls.c
> >>index bac53a4350..bda9abecfa 100644
> >>--- a/libavformat/hls.c
> >>+++ b/libavformat/hls.c
> >>@@ -630,8 +630,16 @@ static int open_url(AVFormatContext *s, AVIOContext
> >>**pb, const char *url,
> >> ret = s->io_open(s, pb, url, AVIO_FLAG_READ, &tmp);
> >> if (ret >= 0) {
> >> // update cookies on http response with setcookies.
> >>- void *u = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb;
> >>- update_options(&c->cookies, "cookies", u);
> >>+ char *new_cookies = NULL;
> >>+
> >>+ if (s->flags ^ AVFMT_FLAG_CUSTOM_IO)
> >>+ av_opt_get(*pb, "cookies", AV_OPT_SEARCH_CHILDREN,
> >>(uint8_t**)&new_cookies);
> >Did you mean & instead of ^?
>
> No, the original code was structured to set *u to null (and thus did
> not copy cookies) iff AVFMT_FLAG_CUSTOM_IO was set in the flags. So
> using ^ is logically equivalent -- cookies are copied only if
> AVFMT_FLAG_CUSTOM_IO is not set.it would also copy if another flag is set, is that intended ? [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB It is what and why we do it that matters, not just one of them.
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
