aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/dcc/video.cpp
diff options
context:
space:
mode:
authorGravatar Fabio Bas2009-12-06 23:01:41 +0000
committerGravatar Fabio Bas2009-12-06 23:01:41 +0000
commitb3743ed6471d0088d180d884986d7caeb37eddca (patch)
treebf663309c8c0b42e8ba85075e85261647058e933 /src/modules/dcc/video.cpp
parentrestored lowercase phonon #includes (fixes phonon compilation without KDE); t... (diff)
downloadKVIrc-b3743ed6471d0088d180d884986d7caeb37eddca.tar.gz
KVIrc-b3743ed6471d0088d180d884986d7caeb37eddca.tar.bz2
KVIrc-b3743ed6471d0088d180d884986d7caeb37eddca.zip
Added an alternative (tricky) codec to compile DCC_VIDEO without OGG_THEORA
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3670 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/dcc/video.cpp')
-rw-r--r--src/modules/dcc/video.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp
index 11d2c6ad5..310deb890 100644
--- a/src/modules/dcc/video.cpp
+++ b/src/modules/dcc/video.cpp
@@ -85,16 +85,19 @@ extern KviDccBroker * g_pDccBroker;
bool kvi_dcc_video_is_valid_codec(const char * codecName)
{
- if(kvi_strEqualCI("jpeg",codecName))return true;
+ if(kvi_strEqualCI("sjpeg",codecName))return true;
+#ifndef COMPILE_DISABLE_OGG_THEORA
if(kvi_strEqualCI("theora",codecName))return true;
+#endif
return false;
}
static KviDccVideoCodec * kvi_dcc_video_get_codec(const char *codecName)
{
- Q_UNUSED(codecName);
-// if(kvi_strEqualCI("jpeg",codecName))return new KviDccVideoJpegCodec();
- return new KviDccVideoTheoraCodec();
+#ifndef COMPILE_DISABLE_OGG_THEORA
+ if(kvi_strEqualCI("theora",codecName))return new KviDccVideoTheoraCodec();
+#endif
+ return new KviDccVideoSJpegCodec();
}