[MPlayer-cvslog] r28552 - trunk/libmpcodecs/mp_image.h

[reimar]

Author: reimar
Date: Sat Feb 14 09:37:29 2009
New Revision: 28552

Log:
Cosmetics: handle all special/compressed formats in a single if in mp_image_setfmt

Modified:
   trunk/libmpcodecs/mp_image.h

Modified: trunk/libmpcodecs/mp_image.h
==============================================================================
--- trunk/libmpcodecs/mp_image.h	Sat Feb 14 09:29:45 2009	(r28551)
+++ trunk/libmpcodecs/mp_image.h	Sat Feb 14 09:37:29 2009	(r28552)
@@ -108,21 +108,10 @@ typedef struct mp_image_s {
 static inline void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt){
     mpi->flags&=~(MP_IMGFLAG_PLANAR|MP_IMGFLAG_YUV|MP_IMGFLAG_SWAPPED);
     mpi->imgfmt=out_fmt;
-    if(out_fmt == IMGFMT_MPEGPES){
-	mpi->bpp=0;
-	return;
-    }
-    if(out_fmt == IMGFMT_ZRMJPEGNI ||
-	    out_fmt == IMGFMT_ZRMJPEGIT ||
-	    out_fmt == IMGFMT_ZRMJPEGIB){
-	mpi->bpp=0;
-	return;
-    }
-    if(IMGFMT_IS_VDPAU(out_fmt)){
-        mpi->bpp=0;
-        return;
-    }
-    if(IMGFMT_IS_XVMC(out_fmt)){
+    // compressed formats
+    if(out_fmt == IMGFMT_MPEGPES ||
+       out_fmt == IMGFMT_ZRMJPEGNI || out_fmt == IMGFMT_ZRMJPEGIT || out_fmt == IMGFMT_ZRMJPEGIB ||
+       IMGFMT_IS_VDPAU(out_fmt) || IMGFMT_IS_XVMC(out_fmt)){
 	mpi->bpp=0;
 	return;
     }