Merge commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 14:56:42 +0000 (16:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 14:56:42 +0000 (16:56 +0200)
commit229a1e8694291c4ae77c27293dc57f78b2e3d223
tree299c051500cf2106e2a6dd1eac847cc5cacc4afb
parent5727d387fb244aa754847494e199ab3b4e084266
parentb2e059a1ffbdaaa985c6a7dcdd684fa034725238
Merge commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238'

* commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238':
  pixdesc: K&R formatting cosmetics

Conflicts:
libavutil/pixdesc.c
libavutil/pixdesc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/pixdesc.c
libavutil/pixdesc.h