diff options
| author | Matthew Hoops | 2014-01-17 19:17:29 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2014-01-17 19:17:29 -0500 |
| commit | b23f7640289fc1203d5e8ad3f27a24c403bcc4b3 (patch) | |
| tree | 1dedc3556a7d566099fe2348c880554fb22d579c /video | |
| parent | c8ea0dcd10e87b8a32c9397649d377428e33007d (diff) | |
| download | scummvm-rg350-b23f7640289fc1203d5e8ad3f27a24c403bcc4b3.tar.gz scummvm-rg350-b23f7640289fc1203d5e8ad3f27a24c403bcc4b3.tar.bz2 scummvm-rg350-b23f7640289fc1203d5e8ad3f27a24c403bcc4b3.zip | |
VIDEO: Rename the Motion JPEG decoder to JPEG to better reflect its purpose
This JPEG is separate from the modified JPEG format used in MJPEG
Diffstat (limited to 'video')
| -rw-r--r-- | video/codecs/jpeg.cpp (renamed from video/codecs/mjpeg.cpp) | 2 | ||||
| -rw-r--r-- | video/codecs/jpeg.h (renamed from video/codecs/mjpeg.h) | 6 | ||||
| -rw-r--r-- | video/module.mk | 2 | ||||
| -rw-r--r-- | video/qt_decoder.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/video/codecs/mjpeg.cpp b/video/codecs/jpeg.cpp index 10fd9d7c50..f3886f334a 100644 --- a/video/codecs/mjpeg.cpp +++ b/video/codecs/jpeg.cpp @@ -25,7 +25,7 @@ #include "graphics/surface.h" #include "graphics/decoders/jpeg.h" -#include "video/codecs/mjpeg.h" +#include "video/codecs/jpeg.h" namespace Common { class SeekableReadStream; diff --git a/video/codecs/mjpeg.h b/video/codecs/jpeg.h index d71454799c..1023d97779 100644 --- a/video/codecs/mjpeg.h +++ b/video/codecs/jpeg.h @@ -20,8 +20,8 @@ * */ -#ifndef VIDEO_CODECS_MJPEG_H -#define VIDEO_CODECS_MJPEG_H +#ifndef VIDEO_CODECS_JPEG_H +#define VIDEO_CODECS_JPEG_H #include "video/codecs/codec.h" #include "graphics/pixelformat.h" @@ -37,7 +37,7 @@ struct Surface; namespace Video { /** - * Motion JPEG decoder. + * JPEG decoder. * * Used in video: * - QuickTimeDecoder diff --git a/video/module.mk b/video/module.mk index a491947aaf..65e5fabd39 100644 --- a/video/module.mk +++ b/video/module.mk @@ -12,7 +12,7 @@ MODULE_OBJS := \ codecs/cdtoons.o \ codecs/cinepak.o \ codecs/indeo3.o \ - codecs/mjpeg.o \ + codecs/jpeg.o \ codecs/msrle.o \ codecs/msvideo1.o \ codecs/qtrle.o \ diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp index 7539d4a1e2..11a27beb10 100644 --- a/video/qt_decoder.cpp +++ b/video/qt_decoder.cpp @@ -40,7 +40,7 @@ // Video codecs #include "video/codecs/cinepak.h" -#include "video/codecs/mjpeg.h" +#include "video/codecs/jpeg.h" #include "video/codecs/qtrle.h" #include "video/codecs/rpza.h" #include "video/codecs/smc.h" @@ -296,7 +296,7 @@ void QuickTimeDecoder::VideoSampleDesc::initCodec() { warning("Sorenson Video 3 not yet supported"); break; case MKTAG('j','p','e','g'): - // Motion JPEG: Used by some Myst ME 10th Anniversary videos. + // JPEG: Used by some Myst ME 10th Anniversary videos. _videoCodec = new JPEGDecoder(); break; case MKTAG('Q','k','B','k'): |