Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 16:31:18 +0000 (17:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 16:33:05 +0000 (17:33 +0100)
commitb594aceb9482955fc5fadad51e25219cb29d4a1b
treed9b7ba15d3c2d80d16128d6e24748c5892b1c0f4
parent3552bd93185a1f9be8733a17104f462cd7d7a9a7
parent5846646296e377e093441dfe9eadde38ff1f7c99
Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'

* commit '5846646296e377e093441dfe9eadde38ff1f7c99':
  Add raw HEVC demuxer

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

See: 902a5fa7228d92bf7e0a8f523a25cf72d31afab4 and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
doc/general.texi
libavformat/hevcdec.c
libavformat/version.h