Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Oct 2012 11:57:10 +0000 (13:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Oct 2012 11:57:10 +0000 (13:57 +0200)
commit5717562c789f9be9c8e4bab7caec4df83f77cebe
tree134e045d40aa79aca5d42fd00c72f317cf519a2d
parent25f3827e1daf6b75e6b46e2bccaf8cbc273d6b42
parentc1fcfdec75468009dc7de29a5d1c6adf3b2ef77d
Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d'

* commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d':
  rangecoder-test: Return in case of an error
  build: simplify enabling of compat objects

Conflicts:
configure
libavutil/Makefile

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