diff --git a/ChangeLog b/ChangeLog
index 3818903e7..eacbfa287 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-11  Moritz Bunkus  <moritz@bunkus.org>
+
+        * mkvmerge: bug fix: fixed detection of video tracks in QuickTime
+        files whose FourCC code is unknown to mkvmerge.
+
 2015-03-10  Moritz Bunkus  <moritz@bunkus.org>
 
         * mkvextract: bug fix: Fixed VobSub file naming when mkvextract is
diff --git a/src/input/r_qtmp4.cpp b/src/input/r_qtmp4.cpp
index 60e642d78..e20c805f5 100644
--- a/src/input/r_qtmp4.cpp
+++ b/src/input/r_qtmp4.cpp
@@ -594,7 +594,7 @@ qtmp4_reader_c::handle_moov_atom(qt_atom_t parent,
       new_dmx->id = m_demuxers.size();
 
       handle_trak_atom(new_dmx, atom.to_parent(), level + 1);
-      if ((!new_dmx->is_unknown() && new_dmx->codec) || new_dmx->is_subtitles())
+      if ((!new_dmx->is_unknown() && new_dmx->codec) || new_dmx->is_subtitles() || new_dmx->is_video())
         m_demuxers.push_back(new_dmx);
     }
 
diff --git a/tests/results.txt b/tests/results.txt
index 69085b188..f2d17b8f7 100644
--- a/tests/results.txt
+++ b/tests/results.txt
@@ -319,3 +319,4 @@ T_470avi_idx1_video_not_00db:12e8b014a66eaefcce54fb128d9a0d52-7f247aaf4412b0b9fb
 T_471mp3_bit_id3_tag_at_start_of_file:3ef78eaf47cfd2aac938ef783979048d-d0fc30e07d0e0d083eff4096f36818e3:passed:20150303-181432:1.035125698
 T_472flv_headers_signal_no_tracks:fbf84bd51c789c38433ff3606703d478-fc21b7e38fdd04f1392110c99cff2e65:passed:20150309-182340:0.14645163
 T_473quicktime_cinepak_pcm:5305caa7f72d64029e61f38ab16ad936-0d7f25e05e60278786485ce076af6616:passed:20150309-204710:0.096409655
+T_474quicktime_rpza:0a11f70eb7c575eb625132c02acfa9cc-064f5376d10972b83118bf427334fff3:passed:20150311-192934:0.095698493
diff --git a/tests/test-474quicktime_rpza.rb b/tests/test-474quicktime_rpza.rb
new file mode 100755
index 000000000..04adb57a0
--- /dev/null
+++ b/tests/test-474quicktime_rpza.rb
@@ -0,0 +1,6 @@
+#!/usr/bin/ruby -w
+
+# T_474quicktime_rpza
+describe "mkvmerge / QuickTime with rpza (Road Pizza) video and PCM audio"
+
+(1..2).each { |idx| test_merge "data/mp4/rpza-pcm-#{idx}.mov" }