Merge commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 16:41:01 +0000 (17:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 16:42:10 +0000 (17:42 +0100)
commit3a0c90263605f5cd7992e40d5b91a418621f623f
tree8ede51050dedecf54edc7ad0d311346a247abba2
parentb594aceb9482955fc5fadad51e25219cb29d4a1b
parentea29f965dc71182f77b8efe819630f55e48b0ab7
Merge commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7'

* commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7':
  mov: Support HEVC demuxing

Conflicts:
Changelog
libavformat/mov.c
libavformat/version.h

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