From b23f7640289fc1203d5e8ad3f27a24c403bcc4b3 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 17 Jan 2014 19:17:29 -0500
Subject: 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
---
 video/module.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'video/module.mk')

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 \
-- 
cgit v1.2.3


From d73df0d28cbe91e70affd765cf48d2f8a25943eb Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 17 Jan 2014 20:57:45 -0500
Subject: VIDEO: Add MJPEG support

---
 video/module.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'video/module.mk')

diff --git a/video/module.mk b/video/module.mk
index 65e5fabd39..d836371182 100644
--- a/video/module.mk
+++ b/video/module.mk
@@ -13,6 +13,7 @@ MODULE_OBJS := \
 	codecs/cinepak.o \
 	codecs/indeo3.o \
 	codecs/jpeg.o \
+	codecs/mjpeg.o \
 	codecs/msrle.o \
 	codecs/msvideo1.o \
 	codecs/qtrle.o \
-- 
cgit v1.2.3


From b568ac73b9d2e063eb04693e4610a9932035b696 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 27 Feb 2014 21:27:23 -0500
Subject: IMAGE: Move video codecs to image/

---
 video/module.mk | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'video/module.mk')

diff --git a/video/module.mk b/video/module.mk
index d836371182..5754350e42 100644
--- a/video/module.mk
+++ b/video/module.mk
@@ -8,19 +8,7 @@ MODULE_OBJS := \
 	psx_decoder.o \
 	qt_decoder.o \
 	smk_decoder.o \
-	video_decoder.o \
-	codecs/cdtoons.o \
-	codecs/cinepak.o \
-	codecs/indeo3.o \
-	codecs/jpeg.o \
-	codecs/mjpeg.o \
-	codecs/msrle.o \
-	codecs/msvideo1.o \
-	codecs/qtrle.o \
-	codecs/rpza.o \
-	codecs/smc.o \
-	codecs/svq1.o \
-	codecs/truemotion1.o
+	video_decoder.o
 
 ifdef USE_BINK
 MODULE_OBJS += \
@@ -32,10 +20,5 @@ MODULE_OBJS += \
 	theora_decoder.o
 endif
 
-ifdef USE_MPEG2
-MODULE_OBJS += \
-	codecs/mpeg.o
-endif
-
 # Include common rules
 include $(srcdir)/rules.mk
-- 
cgit v1.2.3