Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 17:04:44 +0000 (18:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 17:05:25 +0000 (18:05 +0100)
commit6262763d8d6457dc9df09331ba24a4219cf56849
treed748170d35bb0fd2437241334f563b6e541c6d18
parent0fbeeb939915b69050d00feab93aa904d133ec5f
parentb6a4701612514c97d22f7ffb37993539f7718352
Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352'

* commit 'b6a4701612514c97d22f7ffb37993539f7718352':
  mpegts: Support HEVC demuxing

Conflicts:
Changelog
libavformat/version.h

See: 93c1fe4de3937df63c3d68e87dd7d2fabd5203c0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavformat/version.h