-
Michael Niedermayer authored
* commit '90558e84': rangecoder: K&R formatting cosmetics Conflicts: libavcodec/rangecoder.c libavcodec/rangecoder.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
c55bebe2
* commit '90558e84': rangecoder: K&R formatting cosmetics Conflicts: libavcodec/rangecoder.c libavcodec/rangecoder.h Merged-by: Michael Niedermayer <michaelni@gmx.at>