]> git.sesse.net Git - ffmpeg/commit
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)
commitfd1e4d66f18372ad21de51bae223a2b699fed885
treef523dabd6c427ad5392ba30ec198b224cae03566
parent87dc8b3af9135f0cfcdf3c0520e3f29e7b0d92c6
parent454697603e4efdfc04fadec40518d56c7dc1e5dd
Merge commit '454697603e4efdfc04fadec40518d56c7dc1e5dd'

* 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>