Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 09:30:30 +0000 (10:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 09:30:30 +0000 (10:30 +0100)
commit1344c0453615a1f0141b11f5f4e3c640ee890afc
treeb89adf4ab7358fb23496c9469090dc19cc695dbd
parent0b82fdcc469ec8f5dd4affe1fe5ae8710b373cd2
parentdc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0
Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'

* commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0':
  mpeg4video: K&R formatting cosmetics

Conflicts:
libavcodec/mpeg4video.h

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