Merge commit '44d16df413878588659dd8901bba016b5a869fd1'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 27 May 2016 12:28:21 +0000 (14:28 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 27 May 2016 12:28:21 +0000 (14:28 +0200)
commit2dc954e0bd54db891cae362fa99b2ad7992d7294
tree724647e0e8c6b7603f6b80b32343a499215a65df
parentd970f7ba31246040787e5ea6eb73bb85cafb932b
parent44d16df413878588659dd8901bba016b5a869fd1
Merge commit '44d16df413878588659dd8901bba016b5a869fd1'

* commit '44d16df413878588659dd8901bba016b5a869fd1':
  h264_parser: eliminate H264SliceContext usage

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