[FFmpeg-cvslog] Merge commit '454697603e4efdfc04fadec40518d56c7dc1e5dd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  8 21:25:32 2014 +0200| [fd1e4d66f18372ad21de51bae223a2b699fed885] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd1e4d66f18372ad21de51bae223a2b699fed885
---