Merge commit '7505c8dfba255f8e6c6dbb574d0cec91da16f24d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 17:19:54 +0000 (18:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 17:19:58 +0000 (18:19 +0100)
* commit '7505c8dfba255f8e6c6dbb574d0cec91da16f24d':
  h264_cavlc: constify all uses of H264Context

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

Simple merge
Simple merge