Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jul 2013 02:08:07 +0000 (04:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jul 2013 02:08:07 +0000 (04:08 +0200)
commit4cd066b69c08cd91aa4b5e40deb4b2f5c7e651ee
treea36d18d2f9cafe7c57ab7d97392d112c9b210139
parent7023715e888005f405a34ec1111d98cf3230bdaf
parent21732063a346475eb22c332b27e8216b79f9ad4a
Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

* commit '21732063a346475eb22c332b27e8216b79f9ad4a':
  movenc: K&R formatting cosmetics

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c
libavformat/movenchint.c