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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 25 12:13:07 2013 +0100| [4ce9e4e9c9c6d0e26256724c7966eebb9af38663] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sndio_dec: Add missing includes for av_gettime()

no change, as this has already been fixed in FFmpeg

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

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