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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 31 13:47:04 2013 +0200| [b043d80be4d8d1a5d16f3e864ebff3a4bbe9c509] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm_bluray: cosmetics

Conflicts:
	libavcodec/pcm-bluray.c

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

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