[FFmpeg-cvslog] Merge commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct  4 12:01:17 2013 +0200| [f3968ab47ca86b1e5bf37815da44ebafe2719d12] | committer: Michael Niedermayer

Merge commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48'

* commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48':
  oggparsevorbis: K&R formatting cosmetics

Conflicts:
	libavformat/oggparsevorbis.c

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

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