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)
commit9f2fad1af768ed374164beed60cddcf0bae8732f
tree3d6c741b49df5c330fb80b99ccc2f7b2cb24f903
parent9d0450ae943a7d1071fa59bfd0c4f7647d733c5f
parent5c4b98de4d101ea715ef86847306a510afd0db0c
Merge commit '5c4b98de4d101ea715ef86847306a510afd0db0c'

* commit '5c4b98de4d101ea715ef86847306a510afd0db0c':
  h264.c: constify all uses of H264Context in slice and lower-level functions

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