[FFmpeg-cvslog] Merge commit 'e13a929314e4a9a09d3146648f876f162f46cc32'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 29 11:08:02 2013 +0200| [688331c51ce649b9c884dab620d097a54e4aa3e3] | committer: Michael Niedermayer

Merge commit 'e13a929314e4a9a09d3146648f876f162f46cc32'

* commit 'e13a929314e4a9a09d3146648f876f162f46cc32':
  xl: K&R formatting cosmetics

Conflicts:
	libavcodec/xl.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=688331c51ce649b9c884dab620d097a54e4aa3e3
---