Merge commit '170fb593c617cd797d00cf05bfb8d8c21d612893'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 10:36:04 +0000 (12:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 10:36:04 +0000 (12:36 +0200)
commit54bbb9056801b778126a4bf5036d9d3638da1802
tree6cffb68457486351ced1dc2f59f0db246aa8a5dc
parentc6953589f9c48a7420ea4284f404fb656ddf869f
parent170fb593c617cd797d00cf05bfb8d8c21d612893
Merge commit '170fb593c617cd797d00cf05bfb8d8c21d612893'

* commit '170fb593c617cd797d00cf05bfb8d8c21d612893':
  pcx: K&R formatting cosmetics

Conflicts:
libavcodec/pcx.c

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