Merge remote-tracking branch 'qatar/master'

Browse Source

* qatar/master:
  sndio_dec: Add missing includes for av_gettime()

no change, as this has already been fixed in FFmpeg

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

pull/13/merge

Michael Niedermayer 12 years ago

parent ae65327e5e fdaacc5932

commit 4ce9e4e9c9

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