[FFmpeg-cvslog] Merge commit 'c9ccbc7333eddd025ebbde5cc4f27d68a950c623'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 29 13:48:02 2015 +0200| [51f7ba9ceec0053ee9c1ad900e1e0a49d3008137] | committer: Michael Niedermayer

Merge commit 'c9ccbc7333eddd025ebbde5cc4f27d68a950c623'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=51f7ba9ceec0053ee9c1ad900e1e0a49d3008137
---