Merge commit 'cc8db760616a7ec3bd39b22ca45888c01326db13'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 11:45:23 +0000 (13:45 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 11:45:23 +0000 (13:45 +0200)
commit4b7685b6c626a159e759a5167af11abef9c7802c
tree9cec99e8273fcb23d0ec9da7a38d2443a0a779ee
parent2f63e83c26f15f5754c87bfbb9f101cd9a2a4b98
parentcc8db760616a7ec3bd39b22ca45888c01326db13
Merge commit 'cc8db760616a7ec3bd39b22ca45888c01326db13'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/mpegts.c