[FFmpeg-devel] [PATCH 1/3] Revert "hls: Add and use a memebr of AVIOInternal rather than abuse opaque"

[Hendrik Leppkes]

On Tue, Mar 15, 2016 at 10:18 PM, Hendrik Leppkes <h.leppkes at gmail.com> wrote:
> On Tue, Mar 15, 2016 at 10:06 PM, Derek Buitenhuis
> <derek.buitenhuis at gmail.com> wrote:
>> On 3/14/2016 11:22 AM, Hendrik Leppkes wrote:
>>> This reverts commit 9f9ed79d4cb40e5d9093899f8a79086ff23da844.
>>>
>>> The hlsopts member was never set anywhere and always NULL, furthermore
>>> the HLS demuxer needs to retrieve the proper options from the underlying
>>> http protocol (cookies, user-agent, etc), so a dummy context won't help.
>>> ---
>>>  libavformat/avio_internal.h | 5 -----
>>>  libavformat/aviobuf.c       | 4 ++++
>>>  libavformat/hls.c           | 6 ++----
>>>  3 files changed, 6 insertions(+), 9 deletions(-)
>>
>> Should this patch be merged into the later one, since, IIRC, it crashes
>> with just this one applied.
>>
>
> I can do that, I suppose. I didn't try them individually, to be
> honest, since the old code was also quite plainly wrong.

Squashed those two and pushed the set.

- Hendrik