Merge remote-tracking branch 'dilaroga/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Feb 2014 14:33:56 +0000 (15:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Feb 2014 14:34:00 +0000 (15:34 +0100)
commite9314f196880092e1177fd19ca00b01033362b0b
treee9726fec0dec8bb1bb9eda968725003669ee2211
parent889afca369ef3a939c68592ef2b1a1756667ce21
parent31a0ca9e75e4c91437c8681b9655a67f09b693dd
Merge remote-tracking branch 'dilaroga/master'

* dilaroga/master:
  vda: fix crash when a frame is dropped.

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