Merge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 11:54:41 +0000 (13:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 11:54:41 +0000 (13:54 +0200)
commit8610751d07bc4c82a8e0cf416c39e845884e6b4d
treec1dd80a18fa3fd799793168e8b6449e4b5982d12
parent10c6d1b28cbd0f39915649940821184d8278eaea
parenta84616b736fca5ebd6b87489dd41bc06ccdf7860
Merge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860'

* commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860':
  mpegvideo: K&R formatting cosmetics

Conflicts:
libavcodec/mpegvideo_motion.c

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