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)
* commit '885ec9242554ad25922258a595ec5e317922a412':
  hevc: Use parsed VUI colorimetry in avcodec

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

Simple merge
Simple merge