Merge commit '460176aa19acb8d8bdb52af1ec97891e0f65843c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:14:25 +0000 (17:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:14:36 +0000 (17:14 +0100)
* commit '460176aa19acb8d8bdb52af1ec97891e0f65843c':
  h264.h: constify all uses of H264Context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264.h

Simple merge