Merge commit '5c4b98de4d101ea715ef86847306a510afd0db0c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 17:18:37 +0000 (18:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 17:18:40 +0000 (18:18 +0100)
* commit '5c4b98de4d101ea715ef86847306a510afd0db0c':
  h264.c: constify all uses of H264Context in slice and lower-level functions

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

Simple merge
Simple merge