[gst-cvs] gst-plugins-base: ffmpegcolorspace: chwck formats just once per _chain()

[Stefan Kost]

Module: gst-plugins-base
Branch: master
Commit: e81303b733b170bd1f8e219f0ab045b28b9804d1
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=e81303b733b170bd1f8e219f0ab045b28b9804d1

Author: Stefan Kost <ensonic at users.sf.net>
Date:   Thu Oct  8 18:08:22 2009 +0300

ffmpegcolorspace: chwck formats just once per _chain()

---

 gst/ffmpegcolorspace/gstffmpegcolorspace.c |    4 +++-
 gst/ffmpegcolorspace/imgconvert.c          |    3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
index f4f1ae8..7045f29 100644
--- a/gst/ffmpegcolorspace/gstffmpegcolorspace.c
+++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
@@ -439,7 +439,9 @@ gst_ffmpegcsp_transform (GstBaseTransform * btrans, GstBuffer * inbuf,
   space = GST_FFMPEGCSP (btrans);
 
   GST_DEBUG ("from %d -> to %d", space->from_pixfmt, space->to_pixfmt);
-  if (space->from_pixfmt == PIX_FMT_NB || space->to_pixfmt == PIX_FMT_NB)
+
+  if (G_UNLIKELY (space->from_pixfmt == PIX_FMT_NB ||
+          space->to_pixfmt == PIX_FMT_NB))
     goto unknown_format;
 
   /* fill from with source data */
diff --git a/gst/ffmpegcolorspace/imgconvert.c b/gst/ffmpegcolorspace/imgconvert.c
index 9af38f3..2e39155 100644
--- a/gst/ffmpegcolorspace/imgconvert.c
+++ b/gst/ffmpegcolorspace/imgconvert.c
@@ -2963,9 +2963,6 @@ img_convert (AVPicture * dst, int dst_pix_fmt,
   ConvertEntry *ce;
   AVPicture tmp1, *tmp = &tmp1;
 
-  if (G_UNLIKELY (src_pix_fmt < 0 || src_pix_fmt >= PIX_FMT_NB ||
-          dst_pix_fmt < 0 || dst_pix_fmt >= PIX_FMT_NB))
-    return -1;
   if (G_UNLIKELY (src_width <= 0 || src_height <= 0))
     return 0;