diff --git a/ChangeLog b/ChangeLog
index e77f060585..9a7e349862 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-26  Julien MOUTTE  <julien@moutte.net>
+
+	* gst/flv/gstflvparse.c: (gst_flv_parse_tag_audio),
+	(gst_flv_parse_tag_video): codec_data is needed for every tag
+	not just the first one. (Fix a stupid bug i introduced without
+	testing)
+
 2007-09-26  Julien MOUTTE  <julien@moutte.net>
 
 	* gst/flv/gstflvparse.c: (gst_flv_parse_tag_audio),
diff --git a/gst/flv/gstflvparse.c b/gst/flv/gstflvparse.c
index a7ca1a89c9..bf475cb3d7 100644
--- a/gst/flv/gstflvparse.c
+++ b/gst/flv/gstflvparse.c
@@ -658,6 +658,9 @@ gst_flv_parse_tag_video (GstFLVDemux * demux, const guint8 * data,
   }
   /* Codec tag */
   codec_tag = flags & 0x0F;
+  if (codec_tag == 4 || codec_tag == 5) {
+    codec_data = 2;
+  }
 
   GST_LOG_OBJECT (demux, "video tag with codec tag %u, keyframe (%d) "
       "(flags %02X)", codec_tag, keyframe, flags);
@@ -685,11 +688,9 @@ gst_flv_parse_tag_video (GstFLVDemux * demux, const guint8 * data,
         break;
       case 4:
         caps = gst_caps_new_simple ("video/x-vp6-flash", NULL);
-        codec_data = 2;
         break;
       case 5:
         caps = gst_caps_new_simple ("video/x-vp6-flash", NULL);
-        codec_data = 2;
         break;
       default:
         GST_WARNING_OBJECT (demux, "unsupported video codec tag %d", codec_tag);