Merge commit 'c9ccbc7333eddd025ebbde5cc4f27d68a950c623'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 11:48:02 +0000 (13:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 11:48:45 +0000 (13:48 +0200)
commit51f7ba9ceec0053ee9c1ad900e1e0a49d3008137
tree82280d8988d4684c5298a04341b458434527d3eb
parent16b90d0bcbca75b48f5d6ba6555c185424cbc7e6
parentc9ccbc7333eddd025ebbde5cc4f27d68a950c623
Merge commit 'c9ccbc7333eddd025ebbde5cc4f27d68a950c623'

* commit 'c9ccbc7333eddd025ebbde5cc4f27d68a950c623':
  h264: update the current bit depth/chroma type in init_slice_header()

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