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