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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec  3 12:20:44 2013 +0100| [0e15a344c1ce1a0e8c5331c7608d63c384e25a67] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  alsa-audio-dec: explicitly cast the delay to a signed int64

Conflicts:
	libavdevice/alsa-audio-dec.c

no change as the buggy code has been replaced in ffmpeg

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

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