Merge commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jul 2013 09:45:48 +0000 (11:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jul 2013 09:45:48 +0000 (11:45 +0200)
commit75fbe41fc61eb8db693d00a529ba7a31830308e1
tree8f624b56be38fcc5930c667544d7595b8fcd8904
parent1f7acf3cff0627c38f26f5a749389e156ab1fad0
parentfcae3ff124ee97c9265e3b93f3d41238b2aee9bd
Merge commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd'

* commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd':
  dsicinav: K&R formatting cosmetics

Conflicts:
libavcodec/dsicinav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsicinav.c