libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 12:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VIDEO: Rename the Motion JPEG decoder to JPEG to better reflect its purpose

Browse Source 
This JPEG is separate from the modified JPEG format used in MJPEG
This commit is contained in:
Matthew Hoops 2014-01-17 19:17:29 -05:00
parent c8ea0dcd10
commit b23f764028
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
video/codecs/mjpeg.cpp → video/codecs/jpeg.cpp
View File

@ -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;

6
video/codecs/mjpeg.h → video/codecs/jpeg.h
View File

@ -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

2
video/module.mk
View File

@ -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 \

4
video/qt_decoder.cpp
View File

@ -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'):