[FFmpeg-cvslog] Merge commit '8e373fe048812a25b238ea60a7052b8c07639a42'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Jul 14 01:23:39 2015 +0200| [e17a459af06e222a04b98d1ef59b12e408f061e5] | committer: Michael Niedermayer

Merge commit '8e373fe048812a25b238ea60a7052b8c07639a42'

* commit '8e373fe048812a25b238ea60a7052b8c07639a42':
  hevc: Factor out the pixel format mapping from the sps parser

Conflicts:
	libavcodec/hevc_ps.c

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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