Commit b0c543b1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'da39cac8'

Not merged, its not broken

* commit 'da39cac8':
  Drop broken and unused CABAC test program.

Conflicts:
	libavcodec/Makefile
	libavcodec/cabac.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d4e74d5d da39cac8
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