-
Michael Niedermayer authored
* qatar/master: bitstream_filter: K&R formatting cosmetics Conflicts: libavcodec/bitstream_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
98277fd1
* qatar/master:
bitstream_filter: K&R formatting cosmetics
Conflicts:
libavcodec/bitstream_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>