diff options
author | Johannes Schickel | 2012-09-26 04:17:31 +0200 |
---|---|---|
committer | Johannes Schickel | 2012-09-26 04:17:55 +0200 |
commit | 89abab97e3124fa25eb4c7d3e8b38501747a8d17 (patch) | |
tree | d60a833c9ed352fbe44c0b9a6b8ff43fcbc29419 /video | |
parent | a6c6c74350bb673c178d9756a1625ca128d24f21 (diff) | |
download | scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.tar.gz scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.tar.bz2 scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.zip |
JANITORIAL: Remove trailing whitespaces.
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
Diffstat (limited to 'video')
-rw-r--r-- | video/avi_decoder.cpp | 2 | ||||
-rw-r--r-- | video/avi_decoder.h | 2 | ||||
-rw-r--r-- | video/bink_decoder.cpp | 2 | ||||
-rw-r--r-- | video/coktel_decoder.cpp | 2 | ||||
-rw-r--r-- | video/psx_decoder.cpp | 4 | ||||
-rw-r--r-- | video/psx_decoder.h | 2 | ||||
-rw-r--r-- | video/theora_decoder.cpp | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp index 0d51f5b130..6062049b72 100644 --- a/video/avi_decoder.cpp +++ b/video/avi_decoder.cpp @@ -379,7 +379,7 @@ void AVIDecoder::readNextPacket() { } } -AVIDecoder::AVIVideoTrack::AVIVideoTrack(int frameCount, const AVIStreamHeader &streamHeader, const BitmapInfoHeader &bitmapInfoHeader) +AVIDecoder::AVIVideoTrack::AVIVideoTrack(int frameCount, const AVIStreamHeader &streamHeader, const BitmapInfoHeader &bitmapInfoHeader) : _frameCount(frameCount), _vidsHeader(streamHeader), _bmInfo(bitmapInfoHeader) { memset(_palette, 0, sizeof(_palette)); _videoCodec = createCodec(); diff --git a/video/avi_decoder.h b/video/avi_decoder.h index a3a262db36..3bdc0561d1 100644 --- a/video/avi_decoder.h +++ b/video/avi_decoder.h @@ -214,7 +214,7 @@ private: }; OldIndex _ixInfo; - AVIHeader _header; + AVIHeader _header; Common::SeekableReadStream *_fileStream; bool _decodedHeader; diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp index 37e12624b8..1ece22c963 100644 --- a/video/bink_decoder.cpp +++ b/video/bink_decoder.cpp @@ -236,7 +236,7 @@ BinkDecoder::AudioInfo::~AudioInfo() { BinkDecoder::BinkVideoTrack::BinkVideoTrack(uint32 width, uint32 height, const Graphics::PixelFormat &format, uint32 frameCount, const Common::Rational &frameRate, bool swapPlanes, bool hasAlpha, uint32 id) : _frameCount(frameCount), _frameRate(frameRate), _swapPlanes(swapPlanes), _hasAlpha(hasAlpha), _id(id) { - _curFrame = -1; + _curFrame = -1; for (int i = 0; i < 16; i++) _huffman[i] = 0; diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp index 5d7efe87af..08340a19a6 100644 --- a/video/coktel_decoder.cpp +++ b/video/coktel_decoder.cpp @@ -1317,7 +1317,7 @@ void IMDDecoder::processFrame() { // Set palette if (cmd == kCommandPalette) { _stream->skip(2); - + _paletteDirty = true; for (int i = 0; i < 768; i++) diff --git a/video/psx_decoder.cpp b/video/psx_decoder.cpp index f19802f349..57c8972ee5 100644 --- a/video/psx_decoder.cpp +++ b/video/psx_decoder.cpp @@ -234,7 +234,7 @@ void PSXStreamDecoder::readNextPacket() { Common::SeekableReadStream *frame = new Common::MemoryReadStream(partialFrame, frameSize, DisposeAfterUse::YES); _videoTrack->decodeFrame(frame, sectorsRead); - + delete frame; delete sector; return; @@ -297,7 +297,7 @@ Common::SeekableReadStream *PSXStreamDecoder::readSector() { // Ha! It's palindromic! #define AUDIO_DATA_CHUNK_SIZE 2304 -#define AUDIO_DATA_SAMPLE_COUNT 4032 +#define AUDIO_DATA_SAMPLE_COUNT 4032 static const int s_xaTable[5][2] = { { 0, 0 }, diff --git a/video/psx_decoder.h b/video/psx_decoder.h index 11f311594d..d1d5204e37 100644 --- a/video/psx_decoder.h +++ b/video/psx_decoder.h @@ -149,7 +149,7 @@ private: uint32 _frameCount; Common::SeekableReadStream *_stream; PSXVideoTrack *_videoTrack; - PSXAudioTrack *_audioTrack; + PSXAudioTrack *_audioTrack; Common::SeekableReadStream *readSector(); }; diff --git a/video/theora_decoder.cpp b/video/theora_decoder.cpp index bf953b0de9..63aa93e2f5 100644 --- a/video/theora_decoder.cpp +++ b/video/theora_decoder.cpp @@ -302,7 +302,7 @@ bool TheoraDecoder::TheoraVideoTrack::decodePacket(ogg_packet &oggPacket) { _nextFrameStartTime += _frameRate.getInverse().toDouble(); else _nextFrameStartTime = time; - + return true; } |