diff --git a/ChangeLog b/ChangeLog
index f2a858416a..0f2c2a45ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-18  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst-libs/gst/riff/riff-ids.h:
+	* gst-libs/gst/riff/riff-media.c:
+	(gst_riff_create_video_template_caps):
+          Add more FOURCCs (sort list to make stuff easier to find),
+          add comment what those 16 bytes in struct _gst_riff_strh according to
+          one avi-dumper are
+
 2006-07-17  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst-libs/gst/audio/multichannel.c:
diff --git a/gst-libs/gst/riff/riff-ids.h b/gst-libs/gst/riff/riff-ids.h
index a3f6024549..cbb4a2ca90 100644
--- a/gst-libs/gst/riff/riff-ids.h
+++ b/gst-libs/gst/riff/riff-ids.h
@@ -245,7 +245,12 @@ typedef struct _gst_riff_strh {
   guint32 bufsize;           /* suggested buffer size */
   guint32 quality;
   guint32 samplesize;
-  /* XXX 16 bytes ? */
+  /* rcFrame, RECT structure(struct of 4 shorts)
+  gint32  left;
+  gint32  top;
+  gint32  right;
+  gint32  bottom;
+  */
 } gst_riff_strh;
 
 typedef struct _gst_riff_strf_vids {       /* == BitMapInfoHeader */
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 7ad51f1517..569e768382 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -1026,54 +1026,55 @@ GstCaps *
 gst_riff_create_video_template_caps (void)
 {
   guint32 tags[] = {
-    GST_MAKE_FOURCC ('I', '4', '2', '0'),
-    GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'),
-    GST_MAKE_FOURCC ('Y', 'V', 'U', '9'),
-    GST_MAKE_FOURCC ('M', 'J', 'P', 'G'),
+    GST_MAKE_FOURCC ('3', 'I', 'V', '1'),
+    GST_MAKE_FOURCC ('A', 'S', 'V', '1'),
+    GST_MAKE_FOURCC ('A', 'S', 'V', '2'),
+    GST_MAKE_FOURCC ('C', 'L', 'J', 'R'),
+    GST_MAKE_FOURCC ('C', 'Y', 'U', 'V'),
+    GST_MAKE_FOURCC ('D', 'I', 'B', ' '),
+    GST_MAKE_FOURCC ('D', 'I', 'V', '3'),
+    GST_MAKE_FOURCC ('D', 'I', 'V', 'X'),
+    GST_MAKE_FOURCC ('D', 'U', 'C', 'K'),
     GST_MAKE_FOURCC ('D', 'V', 'S', 'D'),
+    GST_MAKE_FOURCC ('D', 'X', '5', '0'),
+    GST_MAKE_FOURCC ('F', 'L', 'V', '1'),
+    GST_MAKE_FOURCC ('H', '2', '6', '3'),
+    GST_MAKE_FOURCC ('H', 'F', 'Y', 'U'),
+    GST_MAKE_FOURCC ('I', '2', '6', '3'),
+    GST_MAKE_FOURCC ('I', '4', '2', '0'),
+    GST_MAKE_FOURCC ('I', 'V', '3', '2'),
+    GST_MAKE_FOURCC ('I', 'V', '4', '1'),
+    GST_MAKE_FOURCC ('I', 'V', '5', '0'),
+    GST_MAKE_FOURCC ('M', '4', 'S', '2'),
+    GST_MAKE_FOURCC ('M', 'J', 'P', 'G'),
+    GST_MAKE_FOURCC ('M', 'P', '4', '2'),
+    GST_MAKE_FOURCC ('M', 'P', '4', '3'),
+    GST_MAKE_FOURCC ('M', 'P', 'E', 'G'),
+    GST_MAKE_FOURCC ('M', 'P', 'G', '2'),
+    GST_MAKE_FOURCC ('M', 'P', 'G', '4'),
+    GST_MAKE_FOURCC ('M', 'S', 'Z', 'H'),
+    GST_MAKE_FOURCC ('P', 'N', 'G', ' '),
+    GST_MAKE_FOURCC ('R', 'L', 'E', ' '),
+    GST_MAKE_FOURCC ('R', 'T', '2', '1'),
+    GST_MAKE_FOURCC ('S', 'P', '5', '3'),
+    GST_MAKE_FOURCC ('T', 'M', '2', '0'),
+    GST_MAKE_FOURCC ('T', 'S', 'C', 'C'),
+    GST_MAKE_FOURCC ('U', 'L', 'T', 'I'),
+    GST_MAKE_FOURCC ('V', 'C', 'R', '1'),
+    GST_MAKE_FOURCC ('V', 'C', 'R', '2'),
+    GST_MAKE_FOURCC ('V', 'M', 'n', 'c'),
+    GST_MAKE_FOURCC ('V', 'P', '3', ' '),
     GST_MAKE_FOURCC ('W', 'M', 'V', '1'),
     GST_MAKE_FOURCC ('W', 'M', 'V', '2'),
     GST_MAKE_FOURCC ('W', 'M', 'V', '3'),
-    GST_MAKE_FOURCC ('M', 'P', 'G', '4'),
-    GST_MAKE_FOURCC ('M', 'P', '4', '2'),
-    GST_MAKE_FOURCC ('M', 'P', '4', '3'),
-    GST_MAKE_FOURCC ('H', 'F', 'Y', 'U'),
-    GST_MAKE_FOURCC ('D', 'I', 'V', '3'),
-    GST_MAKE_FOURCC ('M', 'P', 'E', 'G'),
-    GST_MAKE_FOURCC ('H', '2', '6', '3'),
-    GST_MAKE_FOURCC ('I', '2', '6', '3'),
-    GST_MAKE_FOURCC ('h', '2', '6', '4'),
-    GST_MAKE_FOURCC ('D', 'I', 'V', 'X'),
-    GST_MAKE_FOURCC ('D', 'X', '5', '0'),
     GST_MAKE_FOURCC ('X', 'V', 'I', 'D'),
-    GST_MAKE_FOURCC ('3', 'I', 'V', '1'),
-    GST_MAKE_FOURCC ('c', 'v', 'i', 'd'),
-    GST_MAKE_FOURCC ('m', 's', 'v', 'c'),
-    GST_MAKE_FOURCC ('R', 'L', 'E', ' '),
-    GST_MAKE_FOURCC ('D', 'I', 'B', ' '),
     GST_MAKE_FOURCC ('X', 'x', 'a', 'n'),
-    GST_MAKE_FOURCC ('I', 'V', '3', '2'),
-    GST_MAKE_FOURCC ('I', 'V', '5', '0'),
-    GST_MAKE_FOURCC ('M', '4', 'S', '2'),
-    GST_MAKE_FOURCC ('M', 'S', 'Z', 'H'),
+    GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'),
+    GST_MAKE_FOURCC ('Y', 'V', 'U', '9'),
     GST_MAKE_FOURCC ('Z', 'L', 'I', 'B'),
-    GST_MAKE_FOURCC ('A', 'S', 'V', '1'),
-    GST_MAKE_FOURCC ('A', 'S', 'V', '2'),
-    GST_MAKE_FOURCC ('V', 'C', 'R', '1'),
-    GST_MAKE_FOURCC ('V', 'C', 'R', '2'),
-    GST_MAKE_FOURCC ('C', 'L', 'J', 'R'),
-    GST_MAKE_FOURCC ('I', 'V', '4', '1'),
-    GST_MAKE_FOURCC ('R', 'T', '2', '1'),
-    GST_MAKE_FOURCC ('D', 'U', 'C', 'K'),
-    GST_MAKE_FOURCC ('T', 'M', '2', '0'),
-    GST_MAKE_FOURCC ('U', 'L', 'T', 'I'),
-    GST_MAKE_FOURCC ('V', 'P', '3', ' '),
-    GST_MAKE_FOURCC ('T', 'S', 'C', 'C'),
-    GST_MAKE_FOURCC ('S', 'P', '5', '3'),
-    GST_MAKE_FOURCC ('P', 'N', 'G', ' '),
-    GST_MAKE_FOURCC ('C', 'Y', 'U', 'V'),
-    GST_MAKE_FOURCC ('F', 'L', 'V', '1'),
-    GST_MAKE_FOURCC ('V', 'M', 'n', 'c'),
+    GST_MAKE_FOURCC ('c', 'v', 'i', 'd'),
+    GST_MAKE_FOURCC ('h', '2', '6', '4'),
+    GST_MAKE_FOURCC ('m', 's', 'v', 'c'),
     /* FILL ME */
     0
   };