[FFmpeg-devel] [PATCH] lavf/aviobuf.c: Adapt avio_accept and avio_handshake to new AVIOContext API

Clément Bœsch u at pkh.me
Tue Oct 4 00:48:33 EEST 2016


On Fri, Sep 30, 2016 at 09:17:54PM +0200, Stephan Holljes wrote:
> Signed-off-by: Stephan Holljes <klaxa1337 at googlemail.com>
> ---
>  libavformat/aviobuf.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> This fixes doc/examples/http_multiclient.c from segfaulting. Seems like these functions
> were forgotten during the white- and blacklisting update.
> 
> diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
> index f3acb32..134d627 100644
> --- a/libavformat/aviobuf.c
> +++ b/libavformat/aviobuf.c
> @@ -1156,7 +1156,8 @@ int avio_read_to_bprint(AVIOContext *h, AVBPrint *pb, size_t max_size)
>  int avio_accept(AVIOContext *s, AVIOContext **c)
>  {
>      int ret;
> -    URLContext *sc = s->opaque;
> +    AVIOInternal *internal = s->opaque;
> +    URLContext *sc = internal->h;
>      URLContext *cc = NULL;
>      ret = ffurl_accept(sc, &cc);
>      if (ret < 0)
> @@ -1166,7 +1167,8 @@ int avio_accept(AVIOContext *s, AVIOContext **c)
>  
>  int avio_handshake(AVIOContext *c)
>  {
> -    URLContext *cc = c->opaque;
> +    AVIOInternal *internal = c->opaque;
> +    URLContext *cc = internal->h;
>      return ffurl_handshake(cc);
>  }

applied, thanks

-- 
Clément B.


More information about the ffmpeg-devel mailing list