Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Sep 2013 11:48:36 +0000 (13:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Sep 2013 11:48:43 +0000 (13:48 +0200)
commitfc477263fadd22434ac0ad8ab9ad15b41dd9be98
treee4b2b1eda6484ad2a1cae2677738a4aa18633c31
parent3c89ec2816956cb1d51a518a5c4a638aa86749e9
parentaca25104ea9c38e662e78bdefa967c8cf9e48584
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm-dvd: Minor leftovers

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