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)
commit0e15a344c1ce1a0e8c5331c7608d63c384e25a67
treebebd8b6020e0da4465748723ed7098f7a10b4b4f
parent0cc5011f9a1b05132f9a20a71feb031f30a8a53b
parent089fac77a6bf9199a5ec161e9c27850f0a680541
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@gmx.at>