Merge commit '34d4c605e9a5116d5289b35633ade5b01cacab24'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 17:26:05 +0000 (18:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 17:26:10 +0000 (18:26 +0100)
* commit '34d4c605e9a5116d5289b35633ade5b01cacab24':
  h264_loopfilter: constify all uses of H264Context

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

Simple merge
Simple merge