Merge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Jul 2013 08:30:47 +0000 (10:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Jul 2013 08:30:47 +0000 (10:30 +0200)
commite28fabb4cbe5e7c6cde8a63733d7530f283a0acb
treeff6eab548d790b446ef6a0bb677270dbecb2e21a
parent1af921196fbc7e2ddd043c56054bdbafc15a85f6
parent6c145ecf785dc3d26ba3fed3ea9892cc80244625
Merge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625'

* commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625':
  twinvq: K&R formatting cosmetics

Conflicts:
libavcodec/twinvq.c

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