Merge pull request #4699 from FernetMenta/adpcm
authorjmarshallnz <jcmarsha@gmail.com>
Sun, 18 May 2014 09:48:23 +0000 (21:48 +1200)
committerTrent Nelson <trent.nelson@pivosgroup.com>
Sat, 7 Jun 2014 05:27:39 +0000 (13:27 +0800)
commit17f07b4dbbce3a3341a84dc6a4b2f60a14089a19
treee13dbef3744aa440e05e256d293e9622702f1260
parentdfdf3faed58d532b990a0ddbc1519dc1b36a567c
Merge pull request #4699 from FernetMenta/adpcm

dvdplayer: demuxFFmpeg - use bits_per_coded_sample if bits_per_raw_sampl...
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp