Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Dec 2013 11:20:44 +0000 (12:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Dec 2013 11:20:44 +0000 (12:20 +0100)
* 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@gmx.at>

Trivial merge