[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 23 19:45:07 2013 +0200| [02a31f6a7490a1a76ac36297ec9bd05f07eeeb24] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  golomb: K&R formatting cosmetics

Conflicts:
	libavcodec/golomb.h

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

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