| Message ID | 20200107135549.22581-10-andreas.rheinhardt@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel,01/11] avformat/avformat: Update AVInputFormat.read_packet documentation | expand |
| Context | Check | Description |
|---|---|---|
| andriy/ffmpeg-patchwork | success | Make fate finished |
On Tue, Jan 07, 2020 at 02:55:48PM +0100, Andreas Rheinhardt wrote: > Fixes #8314. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > libavformat/wtvdec.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c > index 706e8ca38d..92629bb31b 100644 > --- a/libavformat/wtvdec.c > +++ b/libavformat/wtvdec.c > @@ -993,8 +993,10 @@ static int read_header(AVFormatContext *s) > } > > ret = parse_chunks(s, SEEK_TO_DATA, 0, 0); > - if (ret < 0) > + if (ret < 0) { > + wtvfile_close(wtv->pb); > return ret; > + } > avio_seek(wtv->pb, -32, SEEK_CUR); > > timeline_pos = avio_tell(s->pb); // save before opening another file > -- > 2.20.1 looks good. please apply. -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
On 1/7/2020 10:17 PM, Peter Ross wrote: > On Tue, Jan 07, 2020 at 02:55:48PM +0100, Andreas Rheinhardt wrote: >> Fixes #8314. >> >> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> >> --- >> libavformat/wtvdec.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c >> index 706e8ca38d..92629bb31b 100644 >> --- a/libavformat/wtvdec.c >> +++ b/libavformat/wtvdec.c >> @@ -993,8 +993,10 @@ static int read_header(AVFormatContext *s) >> } >> >> ret = parse_chunks(s, SEEK_TO_DATA, 0, 0); >> - if (ret < 0) >> + if (ret < 0) { >> + wtvfile_close(wtv->pb); >> return ret; >> + } >> avio_seek(wtv->pb, -32, SEEK_CUR); >> >> timeline_pos = avio_tell(s->pb); // save before opening another file >> -- >> 2.20.1 > > looks good. please apply. Applied.
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 706e8ca38d..92629bb31b 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -993,8 +993,10 @@ static int read_header(AVFormatContext *s) } ret = parse_chunks(s, SEEK_TO_DATA, 0, 0); - if (ret < 0) + if (ret < 0) { + wtvfile_close(wtv->pb); return ret; + } avio_seek(wtv->pb, -32, SEEK_CUR); timeline_pos = avio_tell(s->pb); // save before opening another file
Fixes #8314. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavformat/wtvdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)