diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-11 13:50:47 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-11 13:50:47 +0400 |
| commit | cb1834410a058222f30b17e627a44f2dcd5f7f69 (patch) | |
| tree | 178ef6024aa0a0635f98acabf5cea0609b7508c7 /src | |
| parent | 164c69d00f3d70bad03de6ea3e9a6c82bccf8b36 (diff) | |
remove unused variable
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5084 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src')
| -rw-r--r-- | src/filters/transform/MpaDecFilter/MpaDecFilter.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp index 55d9a9b89..544469e2d 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp @@ -379,9 +379,9 @@ static DWORD get_lav_channel_layout(uint64_t layout) layout = (layout & ~AV_CH_SURROUND_DIRECT_LEFT) | AV_CH_SIDE_LEFT;
if (layout & AV_CH_SURROUND_DIRECT_RIGHT)
layout = (layout & ~AV_CH_SURROUND_DIRECT_RIGHT) | AV_CH_SIDE_RIGHT;
- }
+ }
- return (DWORD)layout;
+ return (DWORD)layout;
}
CMpaDecFilter::CMpaDecFilter(LPUNKNOWN lpunk, HRESULT* phr)
@@ -2120,7 +2120,7 @@ void CMpaDecFilter::FlacFillBuffer(BYTE buffer[], size_t *bytes) void CMpaDecFilter::FlacDeliverBuffer(unsigned blocksize, const __int32 * const buffer[])
{
WAVEFORMATEX* wfein = (WAVEFORMATEX*)m_pInput->CurrentMediaType().Format();
-
+
WORD nChannels = wfein->nChannels;
DWORD dwChannelMask = GetVorbisChannelMask(nChannels);
@@ -2381,14 +2381,13 @@ HRESULT CMpaDecFilter::DeliverFFmpeg(enum CodecID nCodecId, BYTE* p, int buffsiz if (got_frame) {
CAtlArray<float> pBuff;
- int nRemap;
float* pDataOut;
nChannels = m_pAVCtx->channels;
if (m_pAVCtx->channel_layout)
- dwChannelMask = get_lav_channel_layout(m_pAVCtx->channel_layout);
- else
- dwChannelMask = GetDefChannelMask(nChannels);
+ dwChannelMask = get_lav_channel_layout(m_pAVCtx->channel_layout);
+ else
+ dwChannelMask = GetDefChannelMask(nChannels);
if (nChannels && dwChannelMask) {
|