[FFmpeg-cvslog] Merge remote-tracking branch 'dilaroga/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb  3 15:33:56 2014 +0100| [e9314f196880092e1177fd19ca00b01033362b0b] | committer: Michael Niedermayer

Merge remote-tracking branch 'dilaroga/master'

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

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

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