[FFmpeg-cvslog] Merge commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 16 23:18:57 2013 +0200| [9265bae3567c85b55fc4cdfad141bb34a939d6fd] | committer: Michael Niedermayer

Merge commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f'

* commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f':
  bitstream: K&R formatting cosmetics

Conflicts:
	libavcodec/bitstream.c

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

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