diff options
Diffstat (limited to 'video')
38 files changed, 0 insertions, 128 deletions
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp index 47322c86b7..9685952304 100644 --- a/video/avi_decoder.cpp +++ b/video/avi_decoder.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "common/stream.h" @@ -402,10 +399,8 @@ Codec *AviDecoder::createCodec() { return new MSRLEDecoder(_bmInfo.width, _bmInfo.height, _bmInfo.bitCount); case ID_CVID: return new CinepakDecoder(_bmInfo.bitCount); -#ifdef USE_INDEO3 case ID_IV32: return new Indeo3Decoder(_bmInfo.width, _bmInfo.height); -#endif #ifdef VIDEO_CODECS_TRUEMOTION1_H case ID_DUCK: return new TrueMotion1Decoder(_bmInfo.width, _bmInfo.height); diff --git a/video/avi_decoder.h b/video/avi_decoder.h index 0154b57ea6..540a76855d 100644 --- a/video/avi_decoder.h +++ b/video/avi_decoder.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef VIDEO_AVI_PLAYER_H diff --git a/video/codecs/cdtoons.cpp b/video/codecs/cdtoons.cpp index 51e3c23eaa..9bdc794fa6 100644 --- a/video/codecs/cdtoons.cpp +++ b/video/codecs/cdtoons.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "video/codecs/cdtoons.h" diff --git a/video/codecs/cdtoons.h b/video/codecs/cdtoons.h index dafe5e56ef..8f6d3acb6e 100644 --- a/video/codecs/cdtoons.h +++ b/video/codecs/cdtoons.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef VIDEO_CODECS_CDTOONS_H diff --git a/video/codecs/cinepak.cpp b/video/codecs/cinepak.cpp index 2a782dbafe..c8b23dfc3f 100644 --- a/video/codecs/cinepak.cpp +++ b/video/codecs/cinepak.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "video/codecs/cinepak.h" diff --git a/video/codecs/cinepak.h b/video/codecs/cinepak.h index 34e4fe98eb..67000bf58a 100644 --- a/video/codecs/cinepak.h +++ b/video/codecs/cinepak.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef VIDEO_CODECS_CINEPAK_H diff --git a/video/codecs/codec.h b/video/codecs/codec.h index 4a33d83138..8e4691ca3c 100644 --- a/video/codecs/codec.h +++ b/video/codecs/codec.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef VIDEO_CODECS_CODEC_H diff --git a/video/codecs/indeo3.cpp b/video/codecs/indeo3.cpp index b4f6c6ffe3..7bf7fc8235 100644 --- a/video/codecs/indeo3.cpp +++ b/video/codecs/indeo3.cpp @@ -18,15 +18,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "common/scummsys.h" -#ifdef USE_INDEO3 - /* Intel Indeo 3 decompressor, derived from ffmpeg. * * Original copyright note: * Intel Indeo 3 (IV31, IV32, etc.) video decoder for ffmpeg @@ -3519,5 +3514,3 @@ const uint32 Indeo3Decoder::correctionhighorder[] = { }; } // End of namespace Video - -#endif // USE_INDEO3 diff --git a/video/codecs/indeo3.h b/video/codecs/indeo3.h index a9ae480f17..a07d779dec 100644 --- a/video/codecs/indeo3.h +++ b/video/codecs/indeo3.h @@ -18,15 +18,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "common/scummsys.h" -#ifdef USE_INDEO3 - /* Intel Indeo 3 decompressor, derived from ffmpeg. * * Original copyright note: @@ -90,5 +85,3 @@ private: } // End of namespace Video #endif // VIDEO_CODECS_INDEO3_H - -#endif // USE_INDEO3 diff --git a/video/codecs/mjpeg.cpp b/video/codecs/mjpeg.cpp index 2ef854039b..248a80d714 100644 --- a/video/codecs/mjpeg.cpp +++ b/video/codecs/mjpeg.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "common/system.h" diff --git a/video/codecs/mjpeg.h b/video/codecs/mjpeg.h index d1395a8248..8a446ee005 100644 --- a/video/codecs/mjpeg.h +++ b/video/codecs/mjpeg.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef VIDEO_CODECS_MJPEG_H diff --git a/video/codecs/msrle.cpp b/video/codecs/msrle.cpp index 19309bc7aa..fa03a59efd 100644 --- a/video/codecs/msrle.cpp +++ b/video/codecs/msrle.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Based off ffmpeg's msrledec.c diff --git a/video/codecs/msrle.h b/video/codecs/msrle.h index 130bb8c4ef..2aea66d113 100644 --- a/video/codecs/msrle.h +++ b/video/codecs/msrle.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef VIDEO_CODECS_MSRLE_H diff --git a/video/codecs/msvideo1.cpp b/video/codecs/msvideo1.cpp index 93e9aaae64..06e4640025 100644 --- a/video/codecs/msvideo1.cpp +++ b/video/codecs/msvideo1.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Based off ffmpeg's msvideo.cpp diff --git a/video/codecs/msvideo1.h b/video/codecs/msvideo1.h index c476538a8e..767eece580 100644 --- a/video/codecs/msvideo1.h +++ b/video/codecs/msvideo1.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef VIDEO_CODECS_MSVIDEO1_H diff --git a/video/codecs/qtrle.cpp b/video/codecs/qtrle.cpp index 0ae27f6284..f01720ec86 100644 --- a/video/codecs/qtrle.cpp +++ b/video/codecs/qtrle.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // QuickTime RLE Decoder diff --git a/video/codecs/qtrle.h b/video/codecs/qtrle.h index 20fe2c3242..6f8e113ca5 100644 --- a/video/codecs/qtrle.h +++ b/video/codecs/qtrle.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef VIDEO_CODECS_QTRLE_H diff --git a/video/codecs/rpza.cpp b/video/codecs/rpza.cpp index 0c06661c50..df5738202e 100644 --- a/video/codecs/rpza.cpp +++ b/video/codecs/rpza.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Based off ffmpeg's RPZA decoder diff --git a/video/codecs/rpza.h b/video/codecs/rpza.h index c6b1f43a9a..809a69f444 100644 --- a/video/codecs/rpza.h +++ b/video/codecs/rpza.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef VIDEO_CODECS_RPZA_H diff --git a/video/codecs/smc.cpp b/video/codecs/smc.cpp index bbd6073497..2eedb62a0f 100644 --- a/video/codecs/smc.cpp +++ b/video/codecs/smc.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Based off ffmpeg's SMC decoder diff --git a/video/codecs/smc.h b/video/codecs/smc.h index b2bc612857..f2caca977a 100644 --- a/video/codecs/smc.h +++ b/video/codecs/smc.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef VIDEO_CODECS_SMC_H diff --git a/video/codecs/truemotion1.cpp b/video/codecs/truemotion1.cpp index b7d1f406d7..b8a3c0ab37 100644 --- a/video/codecs/truemotion1.cpp +++ b/video/codecs/truemotion1.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Based on the TrueMotion 1 decoder by Alex Beregszaszi & Mike Melanson in FFmpeg diff --git a/video/codecs/truemotion1.h b/video/codecs/truemotion1.h index 4a51fcb33a..33fbedca93 100644 --- a/video/codecs/truemotion1.h +++ b/video/codecs/truemotion1.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Based on the TrueMotion 1 decoder by Alex Beregszaszi & Mike Melanson in FFmpeg diff --git a/video/codecs/truemotion1data.h b/video/codecs/truemotion1data.h index 06d30c4436..fabec43566 100644 --- a/video/codecs/truemotion1data.h +++ b/video/codecs/truemotion1data.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Based on the TrueMotion 1 decoder by Alex Beregszaszi & Mike Melanson in FFmpeg diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp index 4448c9162e..8ea2d08acb 100644 --- a/video/coktel_decoder.cpp +++ b/video/coktel_decoder.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "common/scummsys.h" @@ -1627,11 +1624,7 @@ bool VMDDecoder::openExternalCodec() { if (_videoCodec == kVideoCodecIndeo3) { _isPaletted = false; -#ifdef USE_INDEO3 _codec = new Indeo3Decoder(_width, _height); -#else - warning("VMDDecoder::openExternalCodec(): Indeo3 decoder not compiled in"); -#endif } else { warning("VMDDecoder::openExternalCodec(): Unknown video codec FourCC \"%s\"", diff --git a/video/coktel_decoder.h b/video/coktel_decoder.h index 46007d55da..8ad1456037 100644 --- a/video/coktel_decoder.h +++ b/video/coktel_decoder.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Currently, only GOB and SCI32 games play IMDs and VMDs, so skip compiling if GOB and SCI32 is disabled. diff --git a/video/dxa_decoder.cpp b/video/dxa_decoder.cpp index 9e3f59705c..561719a27d 100644 --- a/video/dxa_decoder.cpp +++ b/video/dxa_decoder.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "common/debug.h" diff --git a/video/dxa_decoder.h b/video/dxa_decoder.h index 498f4630d4..4eb4a8958d 100644 --- a/video/dxa_decoder.h +++ b/video/dxa_decoder.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef VIDEO_DXA_DECODER_H diff --git a/video/flic_decoder.cpp b/video/flic_decoder.cpp index 47a9244a13..bdcdedc142 100644 --- a/video/flic_decoder.cpp +++ b/video/flic_decoder.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "video/flic_decoder.h" diff --git a/video/flic_decoder.h b/video/flic_decoder.h index 4ca8615de1..9badc3da2e 100644 --- a/video/flic_decoder.h +++ b/video/flic_decoder.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef VIDEO_FLICDECODER_H diff --git a/video/mpeg_player.cpp b/video/mpeg_player.cpp index f583853183..fa98860a38 100644 --- a/video/mpeg_player.cpp +++ b/video/mpeg_player.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // The YUV to RGB conversion code is derived from SDL's YUV overlay code, which diff --git a/video/mpeg_player.h b/video/mpeg_player.h index dde272a9c6..dca0a98a2f 100644 --- a/video/mpeg_player.h +++ b/video/mpeg_player.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef VIDEO_MPEG_PLAYER_H diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp index d9ad65c9a0..328c3fb21b 100644 --- a/video/qt_decoder.cpp +++ b/video/qt_decoder.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // diff --git a/video/qt_decoder.h b/video/qt_decoder.h index 6f7eb9450c..d8beda0f83 100644 --- a/video/qt_decoder.h +++ b/video/qt_decoder.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // diff --git a/video/smk_decoder.cpp b/video/smk_decoder.cpp index 7a95eedf6a..05a20ecd8d 100644 --- a/video/smk_decoder.cpp +++ b/video/smk_decoder.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Based on http://wiki.multimedia.cx/index.php?title=Smacker diff --git a/video/smk_decoder.h b/video/smk_decoder.h index b4eda88203..72cd32a222 100644 --- a/video/smk_decoder.h +++ b/video/smk_decoder.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef VIDEO_SMK_PLAYER_H diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp index dde2c09082..e1122132a8 100644 --- a/video/video_decoder.cpp +++ b/video/video_decoder.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "video/video_decoder.h" diff --git a/video/video_decoder.h b/video/video_decoder.h index b5574fd3fc..52ced4777c 100644 --- a/video/video_decoder.h +++ b/video/video_decoder.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef VIDEO_DECODER_H |