Merge remote-tracking branch 'qatar/master'

Browse Source

* 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>

...

This commit is contained in:

Michael Niedermayer 2013-12-03 12:20:44 +01:00

parent 0cc5011f9a 089fac77a6

commit 0e15a344c1

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available