| Message ID | 20200519104601.12817-5-andreas.rheinhardt@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel,1/5] avformat/aiffenc: Don't forget chapters | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
On Tue, May 19, 2020 at 7:10 PM Andreas Rheinhardt <andreas.rheinhardt@gmail.com> wrote: > > ff_id3v2_free_extra_meta() takes a ID3V2ExtraMeta ** so that it can > already reset the pointer. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > libavformat/hls.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/libavformat/hls.c b/libavformat/hls.c > index 89386ea1b7..3e35d157ad 100644 > --- a/libavformat/hls.c > +++ b/libavformat/hls.c > @@ -1969,7 +1969,6 @@ static int hls_read_header(AVFormatContext *s) > avformat_queue_attached_pictures(pls->ctx); > ff_id3v2_parse_priv(pls->ctx, pls->id3_deferred_extra); > ff_id3v2_free_extra_meta(&pls->id3_deferred_extra); > - pls->id3_deferred_extra = NULL; > } > > if (pls->is_id3_timestamped == -1) > -- > 2.20.1 LGTM
mypopy@gmail.com: > On Tue, May 19, 2020 at 7:10 PM Andreas Rheinhardt > <andreas.rheinhardt@gmail.com> wrote: >> >> ff_id3v2_free_extra_meta() takes a ID3V2ExtraMeta ** so that it can >> already reset the pointer. >> >> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> >> --- >> libavformat/hls.c | 1 - >> 1 file changed, 1 deletion(-) >> >> diff --git a/libavformat/hls.c b/libavformat/hls.c >> index 89386ea1b7..3e35d157ad 100644 >> --- a/libavformat/hls.c >> +++ b/libavformat/hls.c >> @@ -1969,7 +1969,6 @@ static int hls_read_header(AVFormatContext *s) >> avformat_queue_attached_pictures(pls->ctx); >> ff_id3v2_parse_priv(pls->ctx, pls->id3_deferred_extra); >> ff_id3v2_free_extra_meta(&pls->id3_deferred_extra); >> - pls->id3_deferred_extra = NULL; >> } >> >> if (pls->is_id3_timestamped == -1) >> -- >> 2.20.1 > LGTM > Applied, thanks. - Andreas
diff --git a/libavformat/hls.c b/libavformat/hls.c index 89386ea1b7..3e35d157ad 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1969,7 +1969,6 @@ static int hls_read_header(AVFormatContext *s) avformat_queue_attached_pictures(pls->ctx); ff_id3v2_parse_priv(pls->ctx, pls->id3_deferred_extra); ff_id3v2_free_extra_meta(&pls->id3_deferred_extra); - pls->id3_deferred_extra = NULL; } if (pls->is_id3_timestamped == -1)
ff_id3v2_free_extra_meta() takes a ID3V2ExtraMeta ** so that it can already reset the pointer. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavformat/hls.c | 1 - 1 file changed, 1 deletion(-)