Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jul 2013 13:47:50 +0000 (15:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jul 2013 14:00:57 +0000 (16:00 +0200)
commit2e6338b47276bf66fc470a44e8c23a8e57daf07f
tree31774db1582156b13a096b1449a1b08238d3ca65
parentbc95b9428950cd672162bcb2bb98fbecad52a5b3
parent4ecdb5ed44591aba8a0ddb7d443cace836f761f6
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  qdm2: Conceal broken samples

See: 5ee008e01d5a50d976b5f2a4abd6932185672d91

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