[FFmpeg-cvslog] Merge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 31 13:35:52 2013 +0200| [4273236e2f6366e8a8ed7349cd6ac4c2f9e9863e] | committer: Michael Niedermayer

Merge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f'

* commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f':
  pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c

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

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