From ec38016044e674fadc0e8b370afd5cd25110b392 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Mon, 26 May 2014 11:01:11 -0400
Subject: IMAGE: Fix compiling in truemotion

---
 image/codecs/codec.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'image/codecs/codec.cpp')

diff --git a/image/codecs/codec.cpp b/image/codecs/codec.cpp
index 530fb3b836..64acf3f169 100644
--- a/image/codecs/codec.cpp
+++ b/image/codecs/codec.cpp
@@ -58,7 +58,7 @@ Codec *createBitmapCodec(uint32 tag, int width, int height, int bitsPerPixel) {
 		return new CinepakDecoder(bitsPerPixel);
 	case MKTAG('I','V','3','2'):
 		return new Indeo3Decoder(width, height);
-#ifdef VIDEO_CODECS_TRUEMOTION1_H
+#ifdef IMAGE_CODECS_TRUEMOTION1_H
 	case MKTAG('D','U','C','K'):
 	case MKTAG('d','u','c','k'):
 		return new TrueMotion1Decoder(width, height);
-- 
cgit v1.2.3


From 5891ef4d89936917aaa7edf06f5d1fbc06a1271f Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Tue, 27 May 2014 00:09:11 -0400
Subject: VIDEO: Handle Truemotion dimensions specially

Truemotion uses its own demuxer and seems to follow its own AVI rules. Work around it by coercing the video's dimensions to use the codec's internal dimensions.
---
 image/codecs/codec.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'image/codecs/codec.cpp')

diff --git a/image/codecs/codec.cpp b/image/codecs/codec.cpp
index 64acf3f169..6b0c7ebcfb 100644
--- a/image/codecs/codec.cpp
+++ b/image/codecs/codec.cpp
@@ -61,7 +61,7 @@ Codec *createBitmapCodec(uint32 tag, int width, int height, int bitsPerPixel) {
 #ifdef IMAGE_CODECS_TRUEMOTION1_H
 	case MKTAG('D','U','C','K'):
 	case MKTAG('d','u','c','k'):
-		return new TrueMotion1Decoder(width, height);
+		return new TrueMotion1Decoder();
 #endif
 #ifdef USE_MPEG2
 	case MKTAG('m','p','g','2'):
-- 
cgit v1.2.3