Merge commit 'afa93d198aaf2cc661c4df6d4095cd030265d30a'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Oct 2013 10:29:09 +0000 (11:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Oct 2013 10:29:37 +0000 (11:29 +0100)
* commit 'afa93d198aaf2cc661c4df6d4095cd030265d30a':
  hevc_parser: Set pict_type, key_frame and output_picture_number.
  hevc: Search start code in decode_nal_units().

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

Simple merge