Merge commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Nov 2013 15:52:23 +0000 (16:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Nov 2013 16:53:14 +0000 (17:53 +0100)
commit2c6e693c975465691ced790ec52ef65588410117
tree915fa7fbf0173aa4426a8cf4460a44fc1ad76bae
parent18df75fa2fe2f4177d68715db65ff711475c1166
parentd234c7a07c1313fd215e8e242492bf71f5f3321e
Merge commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e'

* commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e':
  mpeg4videodec: K&R formatting cosmetics

Conflicts:
libavcodec/mpeg4videodec.c

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