[FFmpeg-cvslog] Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 20:55:23 2014 +0100| [ab8d9fe9b84c92b21354a7e5df3b61a28477f576] | committer: Michael Niedermayer

Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'

* commit '8ef33497a6a3ed05d2f931809c074ef3d1878834':
  build: Add config option for CABAC code

Conflicts:
	configure
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab8d9fe9b84c92b21354a7e5df3b61a28477f576
---