diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-10-30 23:27:43 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-10-31 22:22:50 +0400 |
| commit | e9f345f492c5f12e025ec4b40c25390233d68a96 (patch) | |
| tree | e50d9dfccaee1469e77ba5b86a4bd8d85d5d03ce | |
| parent | 78d1d5684fa400e8d18771268b6dd48d95e26e65 (diff) | |
Update ffmpeg
| -rw-r--r-- | decoder/LAVAudio/PostProcessor.cpp | 2 | ||||
| -rw-r--r-- | demuxer/Demuxers/LAVFVideoHelper.cpp | 2 | ||||
| m--------- | ffmpeg | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/decoder/LAVAudio/PostProcessor.cpp b/decoder/LAVAudio/PostProcessor.cpp index 0e8c898a..3d11cddc 100644 --- a/decoder/LAVAudio/PostProcessor.cpp +++ b/decoder/LAVAudio/PostProcessor.cpp @@ -633,7 +633,7 @@ HRESULT CLAVAudio::PerformMixing(BufferDetails *buffer) BYTE *pOut = pcmOut->Ptr(); BYTE *pIn = buffer->bBuffer->Ptr(); - ret = avresample_convert(m_avrContext, (void **)&pOut, pcmOut->GetAllocated(), buffer->nSamples, (void **)&pIn, buffer->bBuffer->GetAllocated(), buffer->nSamples); + ret = avresample_convert(m_avrContext, &pOut, pcmOut->GetAllocated(), buffer->nSamples, &pIn, buffer->bBuffer->GetAllocated(), buffer->nSamples); if (ret < 0) { DbgLog((LOG_ERROR, 10, L"avresample_convert failed")); delete pcmOut; diff --git a/demuxer/Demuxers/LAVFVideoHelper.cpp b/demuxer/Demuxers/LAVFVideoHelper.cpp index 9f92a169..ec97ed8e 100644 --- a/demuxer/Demuxers/LAVFVideoHelper.cpp +++ b/demuxer/Demuxers/LAVFVideoHelper.cpp @@ -182,7 +182,7 @@ VIDEOINFOHEADER *CLAVFVideoHelper::CreateVIH(const AVStream* avstream, ULONG *si pvi->bmiHeader.biBitCount = avstream->codec->bits_per_coded_sample; // Validate biBitCount is set to something useful if (pvi->bmiHeader.biBitCount == 0 || avstream->codec->codec_id == AV_CODEC_ID_RAWVIDEO) { - pvi->bmiHeader.biBitCount = av_get_bits_per_pixel2(avstream->codec->pix_fmt); + pvi->bmiHeader.biBitCount = av_get_bits_per_pixel(av_pix_fmt_desc_get(avstream->codec->pix_fmt)); } pvi->bmiHeader.biSizeImage = DIBSIZE(pvi->bmiHeader); // Calculating this value doesn't really make alot of sense, but apparently some decoders freak out if its 0 diff --git a/ffmpeg b/ffmpeg -Subproject c7fd33e7976d2f8824952e05ee91298918a4995 +Subproject 0b7446dbd282dda0d06a6c8202c9dfc97734c9b |