[FFmpeg-devel,04/10] lavf/dashenc: remove unneeded call to dash_free

Submitted by Rodger Combs on March 14, 2018, 6:24 a.m.

Details

Message ID 20180314062445.89909-4-rodger.combs@gmail.com
State New
Headers show

Commit Message

Rodger Combs March 14, 2018, 6:24 a.m.
---
 libavformat/dashenc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

kjeyapal@akamai.com March 18, 2018, 7:17 a.m.
On 3/14/18 11:54 AM, Rodger Combs wrote:
> ---

>  libavformat/dashenc.c | 4 +---

>  1 file changed, 1 insertion(+), 3 deletions(-)

>

> diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c

> index 79d63e52d4..5689aef811 100644

> --- a/libavformat/dashenc.c

> +++ b/libavformat/dashenc.c

> @@ -1030,10 +1030,8 @@ static int dash_write_header(AVFormatContext *s)

>      int i, ret;

>      for (i = 0; i < s->nb_streams; i++) {

>          OutputStream *os = &c->streams[i];

> -        if ((ret = avformat_write_header(os->ctx, NULL)) < 0) {

> -            dash_free(s);

> +        if ((ret = avformat_write_header(os->ctx, NULL)) < 0)

>              return ret;

> -        }

>      }

>      ret = write_manifest(s, 0);

>      if (!ret)


LGTM. Will push this soon.

Patch hide | download patch | download mbox

diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 79d63e52d4..5689aef811 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -1030,10 +1030,8 @@  static int dash_write_header(AVFormatContext *s)
     int i, ret;
     for (i = 0; i < s->nb_streams; i++) {
         OutputStream *os = &c->streams[i];
-        if ((ret = avformat_write_header(os->ctx, NULL)) < 0) {
-            dash_free(s);
+        if ((ret = avformat_write_header(os->ctx, NULL)) < 0)
             return ret;
-        }
     }
     ret = write_manifest(s, 0);
     if (!ret)