Merge commit '75439bb31b3ab76f9a4d30c5de4ff9f407ec8128'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Feb 2015 20:53:29 +0000 (21:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Feb 2015 20:53:29 +0000 (21:53 +0100)
commit46a16ca15a68bfd7341dd9783ecf39bbdf80d08e
tree44bfaeb9dcce7a96e9a05733d4326dee21fe52af
parentb37858eae186ff84afd38cf3e845ba6e037e6397
parent75439bb31b3ab76f9a4d30c5de4ff9f407ec8128
Merge commit '75439bb31b3ab76f9a4d30c5de4ff9f407ec8128'

* commit '75439bb31b3ab76f9a4d30c5de4ff9f407ec8128':
  siff: K&R formatting cosmetics

Conflicts:
libavformat/siff.c

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