Merge commit '454697603e4efdfc04fadec40518d56c7dc1e5dd'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 19:25:32 +0000 (21:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 19:25:32 +0000 (21:25 +0200)
* commit '454697603e4efdfc04fadec40518d56c7dc1e5dd':
  mpegts: Use av_free() to free memory allocated by av_strdup()

Conflicts:
libavformat/mpegtsenc.c

See: 92deb28945a5f2b58908d383f183cfc1bc1d7fae
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge