Re: [FFmpeg-devel] [libav-devel] [PATCH 1/2] rtpenc_mpegts: Free the right ->pb in the error path in the init function

2015-03-09 Thread Andreas Cadhalpun

On 09.03.2015 22:15, Martin Storsjö wrote:

This fixes a typo from 8e32b1f096.
---
  libavformat/rtpenc_mpegts.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/rtpenc_mpegts.c b/libavformat/rtpenc_mpegts.c
index 8ad446b..8ced6a9 100644
--- a/libavformat/rtpenc_mpegts.c
+++ b/libavformat/rtpenc_mpegts.c
@@ -98,7 +98,7 @@ static int rtp_mpegts_write_header(AVFormatContext *s)

  fail:
  if (mpegts_ctx) {
-ffio_free_dyn_buf(&chain->mpegts_ctx->pb);
+ffio_free_dyn_buf(&mpegts_ctx->pb);
  avformat_free_context(mpegts_ctx);
  }
  if (rtp_ctx)



This change looks correct, because chain->mpegts_ctx is NULL if 
mpegts_ctx isn't.


Best regards,
Andreas
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


Re: [FFmpeg-devel] [libav-devel] [PATCH 1/2] rtpenc_mpegts: Free the right ->pb in the error path in the init function

2015-03-10 Thread Michael Niedermayer
On Mon, Mar 09, 2015 at 11:16:13PM +0100, Andreas Cadhalpun wrote:
> On 09.03.2015 22:15, Martin Storsjö wrote:
> >This fixes a typo from 8e32b1f096.
> >---
> >  libavformat/rtpenc_mpegts.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> >diff --git a/libavformat/rtpenc_mpegts.c b/libavformat/rtpenc_mpegts.c
> >index 8ad446b..8ced6a9 100644
> >--- a/libavformat/rtpenc_mpegts.c
> >+++ b/libavformat/rtpenc_mpegts.c
> >@@ -98,7 +98,7 @@ static int rtp_mpegts_write_header(AVFormatContext *s)
> >
> >  fail:
> >  if (mpegts_ctx) {
> >-ffio_free_dyn_buf(&chain->mpegts_ctx->pb);
> >+ffio_free_dyn_buf(&mpegts_ctx->pb);
> >  avformat_free_context(mpegts_ctx);
> >  }
> >  if (rtp_ctx)
> >
> 
> This change looks correct, because chain->mpegts_ctx is NULL if
> mpegts_ctx isn't.

merged

thanks

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Many that live deserve death. And some that die deserve life. Can you give
it to them? Then do not be too eager to deal out death in judgement. For
even the very wise cannot see all ends. -- Gandalf


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel