Merge commit 'b13fc1e344011949929975a3451f78f226aa1de3'
authorTimothy Gu <timothygu99@gmail.com>
Wed, 3 Aug 2016 22:41:59 +0000 (15:41 -0700)
committerTimothy Gu <timothygu99@gmail.com>
Wed, 3 Aug 2016 22:41:59 +0000 (15:41 -0700)
commitbca30ed2b67f095fd31e07319a622ac30ad22978
treeec957ba4fb48112765835398f34b96d23b815a1a
parent4be8ab70a628078a5c89e06157bc9f5cb071dda3
parentb13fc1e344011949929975a3451f78f226aa1de3
Merge commit 'b13fc1e344011949929975a3451f78f226aa1de3'

* commit 'b13fc1e344011949929975a3451f78f226aa1de3':
  h264: do not pass H264Context to h264_slice_header_parse()

Conflicts:
libavcodec/h264dec.h

Did not merge the h264_slice_header_parse() part. We use a few other
members of H264Context for error checking in that function.

Merged-by: Timothy Gu <timothygu99@gmail.com>
libavcodec/h264_refs.c
libavcodec/h264_slice.c
libavcodec/h264dec.h