[FFmpeg-cvslog] Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  1 17:31:18 2013 +0100| [b594aceb9482955fc5fadad51e25219cb29d4a1b] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b594aceb9482955fc5fadad51e25219cb29d4a1b
---