diff --git a/Makefile b/Makefile
index 595e6d44b9..6a5608b7c7 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ MANDIR = ${prefix}/man
 # a BSD compatible 'install' program
 INSTALL = install
 
-SRCS_COMMON = cyuv.c adpcm.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c ducktm1.c roqav.c
+SRCS_COMMON = cyuv.c adpcm.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c ducktm1.c roqav.c qtrpza.c
 SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c libvo/osd.c
 SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) find_sub.c subreader.c lirc_mp.c mixer.c vobsub.c
 
diff --git a/codec-cfg.c b/codec-cfg.c
index 0bc0e0f169..6fd5e02ed0 100644
--- a/codec-cfg.c
+++ b/codec-cfg.c
@@ -245,6 +245,7 @@ static short get_driver(char *s,int audioflag)
 		"qtsmc",
 		"ducktm1",
 		"roqvideo",
+		"qtrpza",
 		NULL
 	};
         char **drv=audioflag?audiodrv:videodrv;
diff --git a/codec-cfg.h b/codec-cfg.h
index 338dd8c2b7..90ee14ba63 100644
--- a/codec-cfg.h
+++ b/codec-cfg.h
@@ -57,6 +57,7 @@
 #define VFM_QTSMC 17
 #define VFM_DUCKTM1 18
 #define VFM_ROQVIDEO 19
+#define VFM_QTRPZA 20
 
 #ifndef GUID_TYPE
 #define GUID_TYPE
diff --git a/dec_video.c b/dec_video.c
index 94b9d95b9c..f0468cd8ff 100644
--- a/dec_video.c
+++ b/dec_video.c
@@ -180,6 +180,14 @@ void decode_duck_tm1(
   int height,
   int bytes_per_pixel);
 
+void qt_decode_rpza(
+  unsigned char *encoded,
+  int encoded_size,
+  unsigned char *decoded,
+  int width,
+  int height,
+  int bytes_per_pixel);
+
 //**************************************************************************//
 //             The OpenDivX stuff:
 //**************************************************************************//
@@ -698,6 +706,7 @@ switch(sh_video->codec->driver){
  case VFM_FLI:
  case VFM_QTRLE:
  case VFM_DUCKTM1:
+ case VFM_QTRPZA:
    {
 #ifdef USE_MP_IMAGE
     sh_video->image->type=MP_IMGTYPE_STATIC;
@@ -1135,6 +1144,13 @@ if(verbose>1){
      sh_video->disp_w, sh_video->disp_h, sh_video->context);
    blit_frame = 3;
    break;
+  case VFM_QTRPZA:
+    qt_decode_rpza(
+        start, in_size, sh_video->our_out_buffer,
+        sh_video->disp_w, sh_video->disp_h,
+        ((out_fmt&255)+7)/8);
+    blit_frame = 3;
+    break;
 } // switch
 //------------------------ frame decoded. --------------------
 
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 5800b10404..1de1e9f1af 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -355,6 +355,13 @@ videocodec roqvideo
   driver roqvideo
   out YV12
 
+videocodec qtrpza
+  info "Quicktime Apple Video"
+  status working
+  fourcc rpza,azpr
+  driver qtrpza
+  out BGR32,BGR24,BGR15
+
 audiocodec imaadpcm
   info "IMA ADPCM"
   status working
diff --git a/qtrpza.c b/qtrpza.c
new file mode 100644
index 0000000000..7b508b6ff1
--- /dev/null
+++ b/qtrpza.c
@@ -0,0 +1,262 @@
+/*
+ *
+ * Apple Video (rpza) QuickTime Decoder for Mplayer
+ * (c) 2002 Roberto Togni
+ *
+ * Fourcc: rpza, azpr
+ *
+ * Some code comes from qtsmc.c by Mike Melanson
+ *
+ */
+
+#include "config.h"
+#include "bswap.h"
+#include "mp_msg.h"
+
+#define BE_16(x) (be2me_16(*(unsigned short *)(x)))
+#define BE_32(x) (be2me_32(*(unsigned int *)(x)))
+
+
+#define ADVANCE_BLOCK() \
+{ \
+	pixel_ptr += block_x_inc; \
+	if (pixel_ptr >= (width * bytes_per_pixel)) \
+	{ \
+		pixel_ptr = 0; \
+		row_ptr += block_y_inc * 4; \
+	} \
+	total_blocks--; \
+	if (total_blocks < 0) \
+	{ \
+		mp_msg(MSGT_DECVIDEO, MSGL_WARN, "block counter just went negative (this should not happen)\n"); \
+		return; \
+	} \
+}
+
+#define PAINT_CURRENT_PIXEL(r, g, b, color) \
+{ \
+	if (bytes_per_pixel == 2) { \
+		(*(unsigned short*)(&decoded[block_ptr])) = color & 0x7fff; \
+		block_ptr += 2; \
+	} else { \
+		decoded[block_ptr++] = (b); \
+		decoded[block_ptr++] = (g); \
+		decoded[block_ptr++] = (r); \
+		if (bytes_per_pixel == 4) /* 32bpp */ \
+			block_ptr++; \
+	} \
+}
+
+#define COLOR_FIX(col_out, col_in) (col_out) = ((col_in) << 3) | ((col_in) >> 2)
+
+#define COLOR_TO_RGB(r, g, b, color) \
+{ \
+	if (bytes_per_pixel != 2) { \
+		unsigned short tmp; \
+		tmp = (color >> 10) & 0x1f; \
+		COLOR_FIX (r, tmp); \
+		tmp = (color >> 5) & 0x1f; \
+		COLOR_FIX (g, tmp); \
+		tmp = color & 0x1f; \
+		COLOR_FIX (b, tmp); \
+	} \
+}
+
+#define COLORAB_TO_RGB4(rgb4, color4, colorA, colorB) \
+{ \
+	unsigned short ta, tb, tt; \
+	if (bytes_per_pixel != 2) { \
+		ta = (colorA >> 10) & 0x1f; \
+		tb = (colorB >> 10) & 0x1f; \
+		COLOR_FIX (rgb4[3][0], ta); \
+		COLOR_FIX (rgb4[0][0], tb); \
+		tt = (11 * ta + 21 * tb) >> 5; \
+		COLOR_FIX (rgb4[1][0], tt); \
+		tt = (21 * ta + 11 * tb) >> 5; \
+		COLOR_FIX (rgb4[2][0], tt); \
+		ta = (colorA >> 5) & 0x1f; \
+		tb = (colorB >> 5) & 0x1f; \
+		COLOR_FIX (rgb4[3][1], ta); \
+		COLOR_FIX (rgb4[0][1], tb); \
+		tt = (11 * ta + 21 * tb) >> 5; \
+		COLOR_FIX (rgb4[1][1], tt); \
+		tt = (21 * ta + 11 * tb) >> 5; \
+		COLOR_FIX (rgb4[2][1], tt); \
+		ta = colorA	& 0x1f; \
+		tb = colorB	& 0x1f; \
+		COLOR_FIX (rgb4[3][2], ta); \
+		COLOR_FIX (rgb4[0][2], tb); \
+		tt = (11 * ta + 21 * tb) >> 5; \
+		COLOR_FIX (rgb4[1][2], tt); \
+		tt = (21 * ta + 11 * tb) >> 5; \
+		COLOR_FIX (rgb4[2][2], tt); \
+	} else { \
+		color4[3] = colorA; \
+		color4[0] = colorB; \
+		ta = (colorA >> 10) & 0x1f; \
+		tb = (colorB >> 10) & 0x1f; \
+		color4[1] = ((11 * ta + 21 * tb) << 5) & 0x7c00; \
+		color4[2] = ((21 * ta + 11 * tb) << 5) & 0x7c00; \
+		ta = (colorA >> 5) & 0x1f; \
+		tb = (colorB >> 5) & 0x1f; \
+		color4[1] |= (11 * ta + 21 * tb) & 0x3e0; \
+		color4[2] |= (21 * ta + 11 * tb) & 0x3e0; \
+		ta = colorA	& 0x1f; \
+		tb = colorB	& 0x1f; \
+		color4[1] |= (11 * ta + 21 * tb) >> 5; \
+		color4[2] |= (21 * ta + 11 * tb) >> 5; \
+	} \
+}
+
+
+
+/*
+ * rpza frame decoder
+ *
+ * Input values:
+ *
+ *	*encoded: buffer of encoded data (chunk)
+ *	encoded_size: length of encoded buffer
+ *	*decoded: buffer where decoded data is written (image buffer)
+ *	width: width of decoded frame in pixels
+ *	height: height of decoded frame in pixels
+ *	bytes_per_pixel: bytes/pixel in output image (color depth)
+ *
+ */
+
+void qt_decode_rpza(char *encoded, int encoded_size, char *decoded, int width,
+										int height, int bytes_per_pixel)
+{
+
+	int i;
+	int stream_ptr = 0;
+	int chunk_size;
+	unsigned char opcode;
+	int n_blocks;
+	unsigned short colorA, colorB;
+	unsigned char r, g, b;
+	unsigned char rgb4[4][3];
+	unsigned short color4[4];
+	unsigned char index, idx;
+
+	int row_ptr = 0;
+	int pixel_ptr = 0;
+	int pixel_x, pixel_y;
+	int row_inc = bytes_per_pixel * (width - 4);
+	int max_height = row_inc * height;
+	int block_x_inc = bytes_per_pixel * 4;
+	int block_y_inc = bytes_per_pixel * width;
+	int block_ptr;
+	int total_blocks;
+
+	
+	/* First byte is always 0xe1. Warn if it's different */
+	if ((unsigned char)encoded[stream_ptr] != 0xe1)
+		mp_msg(MSGT_DECVIDEO, MSGL_WARN,
+					 "First chunk byte is 0x%02x instead of 0x1e\n",
+					 (unsigned char)encoded[stream_ptr]);
+
+	/* Get chunk size, ingnoring first byte */
+	chunk_size = BE_32(&encoded[stream_ptr]) & 0x00FFFFFF;
+	stream_ptr += 4;
+
+	/* If length mismatch use size from MOV file and try to decode anyway */
+	if (chunk_size != encoded_size)
+		mp_msg(MSGT_DECVIDEO, MSGL_WARN, "MOV chunk size != encoded chunk size; using MOV chunk size\n");
+
+	chunk_size = encoded_size;
+
+	/* Number of 4x4 blocks in frame. */
+	total_blocks = (width * height) / (4 * 4);
+
+	/* Process chunk data */
+	while (stream_ptr < chunk_size) {
+		opcode = encoded[stream_ptr++]; /* Get opcode */
+
+		n_blocks = (opcode & 0x1f) +1; /* Extract block counter from opcode */
+
+		/* If opcode MSbit is 0, we need more data to decide what to do */
+		if ((opcode & 0x80) == 0) {
+			colorA = (opcode << 8) | ((unsigned char)encoded[stream_ptr++]);
+			opcode = 0;
+			if ((encoded[stream_ptr] & 0x80) != 0) {
+				/* Must behave as opcode 110xxxxx, using colorA computed above.*/
+				/* Use fake opcode 0x20 to enter switch block at the right place */
+				opcode = 0x20;
+				n_blocks = 1;
+			}
+		}
+		switch (opcode & 0xe0) {
+			/* Skip blocks */
+			case 0x80:
+				while (n_blocks--)
+					ADVANCE_BLOCK();
+				break;
+
+			/* Fill blocks with one color */
+			case 0xa0:
+				colorA = BE_16 (&encoded[stream_ptr]);
+				stream_ptr += 2;
+				COLOR_TO_RGB (r, g, b, colorA);
+				while (n_blocks--) {
+					block_ptr = row_ptr + pixel_ptr;
+					for (pixel_y = 0; pixel_y < 4; pixel_y++) {
+						for (pixel_x = 0; pixel_x < 4; pixel_x++){
+							PAINT_CURRENT_PIXEL(r, g, b, colorA);
+						}
+						block_ptr += row_inc;
+					}
+					ADVANCE_BLOCK();
+				}
+				break;
+
+			/* Fill blocks with 4 colors */
+			case 0xc0:
+				colorA = BE_16 (&encoded[stream_ptr]);
+				stream_ptr += 2;
+			case 0x20:
+				colorB = BE_16 (&encoded[stream_ptr]);
+				stream_ptr += 2;
+				COLORAB_TO_RGB4 (rgb4, color4, colorA, colorB);
+				while (n_blocks--) {
+					block_ptr = row_ptr + pixel_ptr;
+					for (pixel_y = 0; pixel_y < 4; pixel_y++) {
+						index = encoded[stream_ptr++];
+						for (pixel_x = 0; pixel_x < 4; pixel_x++){
+							idx = (index >> (2 * (3 - pixel_x))) & 0x03;
+							PAINT_CURRENT_PIXEL(rgb4[idx][0], rgb4[idx][1], rgb4[idx][2], color4[idx]);
+						}
+						block_ptr += row_inc;
+					}
+					ADVANCE_BLOCK();
+				}
+				break;
+				
+			/* Fill block with 16 colors */
+			case 0x00:
+				block_ptr = row_ptr + pixel_ptr;
+				for (pixel_y = 0; pixel_y < 4; pixel_y++) {
+					for (pixel_x = 0; pixel_x < 4; pixel_x++){
+						/* We already have color of upper left pixel */
+						if ((pixel_y != 0) || (pixel_x !=0)) {
+							colorA = BE_16 (&encoded[stream_ptr]);
+							stream_ptr += 2;
+						}
+						COLOR_TO_RGB (r, g, b, colorA);
+						PAINT_CURRENT_PIXEL(r, g, b, colorA);
+					}
+					block_ptr += row_inc;
+				}
+				ADVANCE_BLOCK();
+				break;
+				
+			/* Unknown opcode */
+			default:
+				mp_msg(MSGT_DECVIDEO, MSGL_HINT, "Unknown opcode %d in rpza chunk."
+							 " Skip remaining %lu bytes of chunk data.\n", opcode,
+							 chunk_size - stream_ptr);
+				return;
+		} /* Opcode switch */
+
+	}
+}