[FFmpeg-devel] lavf/hls: Remove the dead code in parse_playlist()

Submitted by Steven Liu on April 2, 2018, 2:18 a.m.

Details

Message ID 0021CC43-4D3F-4B2E-8114-526D4C98F091@chinaffmpeg.org
State New
Headers show

Commit Message

Steven Liu April 2, 2018, 2:18 a.m.
> On 2 Apr 2018, at 07:09, Jun Zhao <mypopydev@gmail.com> wrote:
> 
> <0001-lavf-hls-Remove-the-dead-code-in-parse_playlist.patch>

From 96de206d191264d2a5aacff5f877caad1d861439 Mon Sep 17 00:00:00 2001
From: Jun Zhao <mypopydev@gmail.com>
Date: Sun, 1 Apr 2018 11:17:45 +0800
Subject: [PATCH] lavf/hls: Remove the dead code in  parse_playlist()

Signed-off-by: Jun Zhao <mypopydev@gmail.com>
---
 libavformat/hls.c | 7 -------
 1 file changed, 7 deletions(-)

Comments

Steven Liu April 4, 2018, 4:09 a.m.
> On 2 Apr 2018, at 10:18, Steven Liu <lq@chinaffmpeg.org> wrote:
> 
> 
> 
>> On 2 Apr 2018, at 07:09, Jun Zhao <mypopydev@gmail.com> wrote:
>> 
>> <0001-lavf-hls-Remove-the-dead-code-in-parse_playlist.patch>
> 
> From 96de206d191264d2a5aacff5f877caad1d861439 Mon Sep 17 00:00:00 2001
> From: Jun Zhao <mypopydev@gmail.com>
> Date: Sun, 1 Apr 2018 11:17:45 +0800
> Subject: [PATCH] lavf/hls: Remove the dead code in  parse_playlist()
> 
> Signed-off-by: Jun Zhao <mypopydev@gmail.com>
> ---
> libavformat/hls.c | 7 -------
> 1 file changed, 7 deletions(-)
> 
> diff --git a/libavformat/hls.c b/libavformat/hls.c
> index c578bf86e3..ae0545a086 100644
> --- a/libavformat/hls.c
> +++ b/libavformat/hls.c
> @@ -743,7 +743,6 @@ static int parse_playlist(HLSContext *c, const char *url,
>     }
> 
>     if (!in) {
> -#if 1
>         AVDictionary *opts = NULL;
>         /* Some HLS servers don't like being sent the range header */
>         av_dict_set(&opts, "seekable", "0", 0);
> @@ -766,12 +765,6 @@ static int parse_playlist(HLSContext *c, const char *url,
>             c->playlist_pb = in;
>         else
>             close_in = 1;
> -#else
> -        ret = open_in(c, &in, url);
> -        if (ret < 0)
> -            return ret;
> -        close_in = 1;
> -#endif
>     }
> 
>     if (av_opt_get(in, "location", AV_OPT_SEARCH_CHILDREN, &new_url) >= 0)
> -- 
> 2.14.1
> 
> 
> 
> 
> 
> should be ok!
Pushed
> 
> Thanks
> Steven
> 
> 
> 
> 
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Thanks
Steven

Patch hide | download patch | download mbox

diff --git a/libavformat/hls.c b/libavformat/hls.c
index c578bf86e3..ae0545a086 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -743,7 +743,6 @@  static int parse_playlist(HLSContext *c, const char *url,
     }
 
     if (!in) {
-#if 1
         AVDictionary *opts = NULL;
         /* Some HLS servers don't like being sent the range header */
         av_dict_set(&opts, "seekable", "0", 0);
@@ -766,12 +765,6 @@  static int parse_playlist(HLSContext *c, const char *url,
             c->playlist_pb = in;
         else
             close_in = 1;
-#else
-        ret = open_in(c, &in, url);
-        if (ret < 0)
-            return ret;
-        close_in = 1;
-#endif
     }
 
     if (av_opt_get(in, "location", AV_OPT_SEARCH_CHILDREN, &new_url) >= 0)