Merge commit '5b220e1e19c17b202d83d9be0868d152109ae8f0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 20:11:37 +0000 (22:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 20:11:37 +0000 (22:11 +0200)
commitefcf1fcad32568d5784640c687b067dd205b1cba
treeaf149bc2f717663fbcc6423db0fa505e55ec8dc7
parent3224a319c0b8b1bfcf842f599630cb9516a503a3
parent5b220e1e19c17b202d83d9be0868d152109ae8f0
Merge commit '5b220e1e19c17b202d83d9be0868d152109ae8f0'

* commit '5b220e1e19c17b202d83d9be0868d152109ae8f0':
  mpegts: Fix memory leaks and related crashes in mpegs_write_header()

Conflicts:
libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpegtsenc.c