Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 31 Aug 2013 11:47:04 +0000 (13:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 31 Aug 2013 11:47:04 +0000 (13:47 +0200)
commitb043d80be4d8d1a5d16f3e864ebff3a4bbe9c509
treefd0c38d2dfc62413d263e7f9a11b903eda24dddb
parent4273236e2f6366e8a8ed7349cd6ac4c2f9e9863e
parent21fd2f84ce21f8e03d0287a759cdcc5a5ea1d0a8
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm_bluray: cosmetics

Conflicts:
libavcodec/pcm-bluray.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pcm-bluray.c