Merge remote-tracking branch 'qatar/master'

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

Merge remote-tracking branch 'qatar/master'
* qatar/master: h264_sei: K&R formatting cosmetics Conflicts: libavcodec/h264_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2ae5ac78 · Michael Niedermayer · da4cd615 · b1841217 · 2ae5ac78
Commit 2ae5ac78 authored Aug 02, 2013 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 87 additions and 67 deletions

h264_sei.c libavcodec/h264_sei.c +87 -67

No files found.
--- a/libavcodec/h264_sei.c
+++ b/libavcodec/h264_sei.c