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)
dvdplayer: demuxFFmpeg - use bits_per_coded_sample if bits_per_raw_sampl...

xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp

index fcc186d..fd4b647 100644 (file)
@@ -1082,6 +1082,8 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int iId)
         st->iBlockAlign = pStream->codec->block_align;
         st->iBitRate = pStream->codec->bit_rate;
         st->iBitsPerSample = pStream->codec->bits_per_raw_sample;
+        if (st->iBitsPerSample == 0)
+          st->iBitsPerSample = pStream->codec->bits_per_coded_sample;
        
         if(m_dllAvUtil.av_dict_get(pStream->metadata, "title", NULL, 0))
           st->m_description = m_dllAvUtil.av_dict_get(pStream->metadata, "title", NULL, 0)->value;