Merge commit '885ec9242554ad25922258a595ec5e317922a412'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 20:37:18 +0000 (21:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 20:37:34 +0000 (21:37 +0100)
commitb906d0488119f85ba871c8a7f089cdc499ce3500
treed8b200b88dca39fa41ed156cad4fc8b0fd64f923
parentbe41f21a3d6deb2714debe42530a28a6f3ee68d5
parent885ec9242554ad25922258a595ec5e317922a412
Merge commit '885ec9242554ad25922258a595ec5e317922a412'

* commit '885ec9242554ad25922258a595ec5e317922a412':
  hevc: Use parsed VUI colorimetry in avcodec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc.c
libavcodec/hevc_ps.c