gst-libs/gst/utils/missing-plugins.c: Remove more fields so that the application...

Original commit message from CVS:
* gst-libs/gst/utils/missing-plugins.c: (copy_and_clean_caps):
Remove more fields so that the application can better blacklist
formats that have been tried before.

diff --git a/ChangeLog b/ChangeLog
index e54ca37..a95a79d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-01-12  Tim-Philipp Müller  <tim at centricular dot net>
 
+       * gst-libs/gst/utils/missing-plugins.c: (copy_and_clean_caps):
+         Remove more fields so that the application can better blacklist
+         formats that have been tried before.
+
+2007-01-12  Tim-Philipp Müller  <tim at centricular dot net>
+
        * gst-libs/gst/audio/mixerutils.h:
          Add G_BEGIN_DECLS and G_END_DECLS guards so these helpers can be
          used when compiling with c++ compilers as well.

diff --git a/gst-libs/gst/pbutils/missing-plugins.c b/gst-libs/gst/pbutils/missing-plugins.c
index aa6581a..bada28e 100644 (file)
--- a/gst-libs/gst/pbutils/missing-plugins.c
+++ b/gst-libs/gst/pbutils/missing-plugins.c
@@ -95,7 +95,15 @@ copy_and_clean_caps (const GstCaps * caps)
   gst_structure_remove_field (s, "palette_data");
   gst_structure_remove_field (s, "pixel-aspect-ratio");
   gst_structure_remove_field (s, "framerate");
-  /* maybe remove width/height too? */
+  gst_structure_remove_field (s, "leaf_size");
+  gst_structure_remove_field (s, "packet_size");
+  /* decoders/encoders almost always handle the usual width/height/channel/rate
+   * range (and if we don't remove this then the app will have a much harder
+   * time blacklisting formats it has unsuccessfully tried to install before) */
+  gst_structure_remove_field (s, "width");
+  gst_structure_remove_field (s, "height");
+  gst_structure_remove_field (s, "channels");
+  gst_structure_remove_field (s, "rate");
 
   return ret;
 }

diff --git a/gst-libs/gst/utils/missing-plugins.c b/gst-libs/gst/utils/missing-plugins.c
index aa6581a..bada28e 100644 (file)
--- a/gst-libs/gst/utils/missing-plugins.c
+++ b/gst-libs/gst/utils/missing-plugins.c
@@ -95,7 +95,15 @@ copy_and_clean_caps (const GstCaps * caps)
   gst_structure_remove_field (s, "palette_data");
   gst_structure_remove_field (s, "pixel-aspect-ratio");
   gst_structure_remove_field (s, "framerate");
-  /* maybe remove width/height too? */
+  gst_structure_remove_field (s, "leaf_size");
+  gst_structure_remove_field (s, "packet_size");
+  /* decoders/encoders almost always handle the usual width/height/channel/rate
+   * range (and if we don't remove this then the app will have a much harder
+   * time blacklisting formats it has unsuccessfully tried to install before) */
+  gst_structure_remove_field (s, "width");
+  gst_structure_remove_field (s, "height");
+  gst_structure_remove_field (s, "channels");
+  gst_structure_remove_field (s, "rate");
 
   return ret;
 }