Merge commit 'a1c699659d56b76c0bf399307f642c6fd6d28281'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Feb 2014 18:12:30 +0000 (19:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Feb 2014 18:12:30 +0000 (19:12 +0100)
commit72d580f819eda3656341072f61a743005ab97729
treefd58dca4aebcb044b1ebac808c51b89a1fa35e9a
parent0306436416486bf69d268da696d7159c3f29b1b4
parenta1c699659d56b76c0bf399307f642c6fd6d28281
Merge commit 'a1c699659d56b76c0bf399307f642c6fd6d28281'

* commit 'a1c699659d56b76c0bf399307f642c6fd6d28281':
  parser: K&R formatting cosmetics

Conflicts:
libavcodec/parser.c

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