Merge commit '4620affa24eedb167482198aa04126bcedd05620'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Sep 2014 12:02:55 +0000 (14:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Sep 2014 12:02:55 +0000 (14:02 +0200)
commit454f98b881fc18c553d56371ac0cd1e703e52571
treef85969f32fc1ad6cc7bff5ec35502ec6372e3481
parent59f49667569b5d92a7713b6db75a9e6bfa939079
parent4620affa24eedb167482198aa04126bcedd05620
Merge commit '4620affa24eedb167482198aa04126bcedd05620'

* commit '4620affa24eedb167482198aa04126bcedd05620':
  m4vdec: K&R formatting cosmetics

Conflicts:
libavformat/m4vdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/m4vdec.c