Merge commit 'd27b8248a6ee7e64c68c46c23e00d703b9caa50c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:13:52 +0000 (17:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:13:56 +0000 (17:13 +0100)
commit48d00b527befb88efce4667d4992e8bae0f53901
tree763da123811db9f9c9147088520752363b30dddf
parent55215383dc04365935c86f8a4db7b5396f1e3541
parentd27b8248a6ee7e64c68c46c23e00d703b9caa50c
Merge commit 'd27b8248a6ee7e64c68c46c23e00d703b9caa50c'

* commit 'd27b8248a6ee7e64c68c46c23e00d703b9caa50c':
  h264_direct: constify all uses of H264Context

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