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)
* commit '2601a9447efb778930b01ac58d2cc1d02498db4e':
  mpegts: Add HEVC definitions

Conflicts:
libavformat/mpegts.h

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

Simple merge