Merge commit '33452aede6acab78f726cd1924824585f00765cc'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:05:04 +0000 (23:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:08:45 +0000 (23:08 +0100)
* commit '33452aede6acab78f726cd1924824585f00765cc':
  hevc: store the VPS list as an AVBufferRef, just like the others *PS

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_ps.c

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

Simple merge