Merge commit '792b9c9dfcf44b657d7854368d975b5ca3bc22ca'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 11:59:25 +0000 (12:59 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 11:59:25 +0000 (12:59 +0100)
commitc6f1f334cbc50b1821b92afaee13abcd3502b34a
treed1b7a5bd3a9b8a579684c7a987fdaadccccc9c37
parentbc66451e5e903698ee0500faf04c1214f3dd157f
parent792b9c9dfcf44b657d7854368d975b5ca3bc22ca
Merge commit '792b9c9dfcf44b657d7854368d975b5ca3bc22ca'

* commit '792b9c9dfcf44b657d7854368d975b5ca3bc22ca':
  h264: set frame_num in start_frame(), not decode_slice_header()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/h264_slice.c