Merge commit 'c83dd2d2a458075a58895c384372f57c1ec26276'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 10:08:30 +0000 (11:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 10:08:53 +0000 (11:08 +0100)
commit967afad03b3b6a1987c5c3079777657fde11e8c9
treef90f55d6295945e303f3312b5884bc3a0aefda27
parent14ab6f9a268a5f0039f0eb4b8ed91c3652d4d0a7
parentc83dd2d2a458075a58895c384372f57c1ec26276
Merge commit 'c83dd2d2a458075a58895c384372f57c1ec26276'

* commit 'c83dd2d2a458075a58895c384372f57c1ec26276':
  rtpenc_mpegts: Free the right ->pb in the error path in the init function

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpenc_mpegts.c