Merge commit 'b53569e0681ff7bc99103ab4c961dbac3cc0fce6'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 22:13:25 +0000 (23:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 22:13:25 +0000 (23:13 +0100)
commita6cb0534e2b5e91c119c77165bc65a6ff14e649b
tree4bb9972d8b24a155ba446cd13b4834c673026944
parentd8151a7e944aea52d167571badc247c8d9972847
parentb53569e0681ff7bc99103ab4c961dbac3cc0fce6
Merge commit 'b53569e0681ff7bc99103ab4c961dbac3cc0fce6'

* commit 'b53569e0681ff7bc99103ab4c961dbac3cc0fce6':
  h264_cabac: remove now unnecessary H264Context function parameters

Conflicts:
libavcodec/h264_cabac.c

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