aboutsummaryrefslogtreecommitdiff
path: root/video/codecs
diff options
context:
space:
mode:
Diffstat (limited to 'video/codecs')
-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
2 files changed, 4 insertions, 4 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