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>

pull/48/merge

Michael Niedermayer 11 years ago

parent 0cc5011f9a 089fac77a6

commit 0e15a344c1

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available