On Wed, Oct 02, 2019 at 09:10:18AM +0200, Matthieu Bouron wrote:
> On Wed, Oct 02, 2019 at 06:04:11AM +0200, Andreas Rheinhardt wrote:
> > Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com>
> > ---
> > libavformat/aiffenc.c | 7 ++++---
> > 1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c
> > index dd8b8c3d01..0b837cd264 100644
> > --- a/libavformat/aiffenc.c
> > +++ b/libavformat/aiffenc.c
> > @@ -235,7 +235,7 @@ static int aiff_write_packet(AVFormatContext *s,
> > AVPacket *pkt)
> >
> > static int aiff_write_trailer(AVFormatContext *s)
> > {
> > - int ret;
> > + int ret = 0;
> > AVIOContext *pb = s->pb;
> > AIFFOutputContext *aiff = s->priv_data;
> > AVCodecParameters *par = s->streams[aiff->audio_stream_idx]->codecpar;
> > @@ -263,7 +263,7 @@ static int aiff_write_trailer(AVFormatContext *s)
> > /* Write ID3 tags */
> > if (aiff->write_id3v2)
> > if ((ret = put_id3v2_tags(s, aiff)) < 0)
> > - return ret;
> > + goto free;
> >
> > /* File length */
> > file_size = avio_tell(pb);
> > @@ -273,9 +273,10 @@ static int aiff_write_trailer(AVFormatContext *s)
> > avio_flush(pb);
> > }
> >
> > +free:
> > ff_packet_list_free(&aiff->pict_list, &aiff->pict_list_end);
> >
> > - return 0;
> > + return ret;
> > }
> >
> > #define OFFSET(x) offsetof(AIFFOutputContext, x)
> > --
> > 2.21.0
>
> LGTM.
will apply
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Old school: Use the lowest level language in which you can solve the problem
conveniently.
New school: Use the highest level language in which the latest supercomputer
can solve the problem without the user falling asleep waiting.
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
