[FFmpeg-cvslog] Merge commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun  8 10:50:24 2013 +0200| [e2d4bcd7b8447eaf9628e893eb482f22ae825237] | committer: Michael Niedermayer

Merge commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1'

* commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1':
  h264_parser: K&R formatting cosmetics
  vorbis: return meaningful errors

Conflicts:
	libavcodec/h264_parser.c

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

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