aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2011-04-25 07:37:40 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2011-04-25 07:37:40 +0000
commit3f6b469fac96a6f1187b6022fac28aa26faee230 (patch)
tree240f5af19851d4128bce7a572117485a0cce70ee /src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
parent09683ad39216fcc72d4e8dff11005c59c3d6b123 (diff)
downloadqmmp-3f6b469fac96a6f1187b6022fac28aa26faee230.tar.gz
qmmp-3f6b469fac96a6f1187b6022fac28aa26faee230.tar.bz2
qmmp-3f6b469fac96a6f1187b6022fac28aa26faee230.zip
ac3 support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2169 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp')
-rw-r--r--src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index 3c735eba1..902f6c9d8 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -159,10 +159,10 @@ bool DecoderFFmpeg::initialize()
}
if (c->channels > 0)
- c->channels = qMin(2, c->channels);
+ c->request_channels = qMin(2, c->channels);
else
- c->channels = 2;
-
+ c->request_channels = 2;
+
#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(101<<8)+0))
av_dump_format(ic,0,0,0);
#else
@@ -192,14 +192,14 @@ bool DecoderFFmpeg::initialize()
#if (LIBAVUTIL_VERSION_INT >= ((50<<16)+(38<<8)+0))
if(c->sample_fmt == AV_SAMPLE_FMT_S32)
- configure(c->sample_rate, c->channels, Qmmp::PCM_S32LE);
+ configure(c->sample_rate, c->request_channels, Qmmp::PCM_S32LE);
else
- configure(c->sample_rate, c->channels, Qmmp::PCM_S16LE);
+ configure(c->sample_rate, c->request_channels, Qmmp::PCM_S16LE);
#else
if(c->sample_fmt == SAMPLE_FMT_S32)
- configure(c->sample_rate, c->channels, Qmmp::PCM_S32LE);
+ configure(c->sample_rate, c->request_channels, Qmmp::PCM_S32LE);
else
- configure(c->sample_rate, c->channels, Qmmp::PCM_S16LE);
+ configure(c->sample_rate, c->request_channels, Qmmp::PCM_S16LE);
#endif
m_bitrate = c->bit_rate;
qDebug("DecoderFFmpeg: initialize succes");