[FFmpeg-cvslog] Merge commit 'cc8db760616a7ec3bd39b22ca45888c01326db13'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Sep 29 13:45:23 2015 +0200| [4b7685b6c626a159e759a5167af11abef9c7802c] | committer: Hendrik Leppkes

Merge commit 'cc8db760616a7ec3bd39b22ca45888c01326db13'

* commit 'cc8db760616a7ec3bd39b22ca45888c01326db13':
  mpegts: use avcodec_get_type() to set codec_type

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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