-
Michael Niedermayer authored
* commit '1ce3ec24': h263: K&R formatting cosmetics Conflicts: libavcodec/h263dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
4c18c314
* commit '1ce3ec24': h263: K&R formatting cosmetics Conflicts: libavcodec/h263dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>