Merge commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 16:01:03 +0000 (18:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 16:01:03 +0000 (18:01 +0200)
commit7565aaecb4978cb5903335ffdea5dae21a924494
tree7bd065b99570f45527606c38208c9161bfc6e4ab
parent89efaabc9949dcdc49126881beaa38355b8f9a44
parentfcc455ff2e11ed04603aead1984a92ac3a4be226
Merge commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226'

* commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226':
  avformat/dv: K&R formatting cosmetics

Conflicts:
libavformat/dv.c

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