Merge commit '920bca3e2332dced9c78bd14cfc2ff138188bd57'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 10:05:58 +0000 (11:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 10:06:13 +0000 (11:06 +0100)
* commit '920bca3e2332dced9c78bd14cfc2ff138188bd57':
  hevc: do not store pcm_flag in the context

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

Simple merge
Simple merge