Merge commit '2601a9447efb778930b01ac58d2cc1d02498db4e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 11:52:32 +0000 (13:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 11:52:32 +0000 (13:52 +0200)
commit2e2e6b1be5913f64830cae1538696601c61c80d0
treea19f628dd687ca7e74d01b8d4805e8af4350f164
parent94d4f9d405074572dc7d4ab40fe32a7e83040dc8
parent2601a9447efb778930b01ac58d2cc1d02498db4e
Merge commit '2601a9447efb778930b01ac58d2cc1d02498db4e'

* commit '2601a9447efb778930b01ac58d2cc1d02498db4e':
  mpegts: Add HEVC definitions

Conflicts:
libavformat/mpegts.h

See: b2880a3de9e3e160c47c069abcc8cb60015407b6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpegts.h