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)
commit10386710fd8eacd3ce5897d1ff4d7f14a3110028
tree0d1a72bbb0c606a35cd8e2c3701d1ec006949ae6
parent83d96e9a19ba1bd71b4380bad6f0947c6d4f97cc
parentafa93d198aaf2cc661c4df6d4095cd030265d30a
Merge commit 'afa93d198aaf2cc661c4df6d4095cd030265d30a'

* 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>
libavcodec/hevc.c