Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 19:55:23 +0000 (20:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 19:55:23 +0000 (20:55 +0100)
commitab8d9fe9b84c92b21354a7e5df3b61a28477f576
tree9bb438dc1e4d65df4f20bd0fce15ed3f3126c956
parentbce2abc9362d3403a74ec60f6bac5bb3e2cdcdc4
parent8ef33497a6a3ed05d2f931809c074ef3d1878834
Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'

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

Conflicts:
configure
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/Makefile