Merge remote branch 'upstream/master'
authorLars Op den Kamp <lars@opdenkamp.eu>
Sun, 23 Jan 2011 02:26:52 +0000 (03:26 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sun, 23 Jan 2011 02:26:52 +0000 (03:26 +0100)
commit4e98a514c6a2975ec234fe19fe058e7e74bcfb7d
tree678a498293daf821732088ef837c6525363cdc2d
parentb7ed68894bbdb0c92d9547a54644dc252ac70dd5
parent8d73cbde1dcd240d80bee9301d0321703a15c995
Merge remote branch 'upstream/master'
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp