Commit a6cb0534 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b53569e0'

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

Conflicts:
	libavcodec/h264_cabac.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d8151a7e b53569e0
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment