Merge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 04:28:07 +0000 (05:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 04:28:07 +0000 (05:28 +0100)
commitfecebb7abab6cac2dc07393f1d2f2463305dcd31
tree1ee36cc167b3940d23dba5e147d49746bca60ec4
parentc9c0451224fd7bc38b4e135e99f114f80c1ae67f
parent5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7
Merge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7'

* commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7':
  mpeg: K&R formatting cosmetics

Conflicts:
libavformat/mpeg.c

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