X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Ffilter_picture.h;h=b39a26637c9b0e9e036aff5363016757cc8fd854;hb=78a1fdbcd67c5308f07a0ce3371596fbc7f7eb0c;hp=98069034aa85c72dedf8a24762c3c6647b47480a;hpb=32c1dee576c989f4a824da3fd58cd5336f6f252e;p=vlc

diff --git a/modules/video_filter/filter_picture.h b/modules/video_filter/filter_picture.h
index 98069034aa..b39a26637c 100644
--- a/modules/video_filter/filter_picture.h
+++ b/modules/video_filter/filter_picture.h
@@ -21,7 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#define CASE_PLANAR_YUV                     \
+/* FIXME: do all of these really have square pixels? */
+#define CASE_PLANAR_YUV_SQUARE              \
         case VLC_FOURCC('I','4','2','0'):   \
         case VLC_FOURCC('I','Y','U','V'):   \
         case VLC_FOURCC('J','4','2','0'):   \
@@ -29,12 +30,18 @@
         case VLC_FOURCC('I','4','1','1'):   \
         case VLC_FOURCC('I','4','1','0'):   \
         case VLC_FOURCC('Y','V','U','9'):   \
-        case VLC_FOURCC('I','4','2','2'):   \
-        case VLC_FOURCC('J','4','2','2'):   \
         case VLC_FOURCC('I','4','4','4'):   \
         case VLC_FOURCC('J','4','4','4'):   \
         case VLC_FOURCC('Y','U','V','A'):
 
+#define CASE_PLANAR_YUV_NONSQUARE           \
+        case VLC_FOURCC('I','4','2','2'):   \
+        case VLC_FOURCC('J','4','2','2'):
+
+#define CASE_PLANAR_YUV                     \
+        CASE_PLANAR_YUV_SQUARE              \
+        CASE_PLANAR_YUV_NONSQUARE           \
+
 #define CASE_PACKED_YUV_422                 \
         case VLC_FOURCC('U','Y','V','Y'):   \
         case VLC_FOURCC('U','Y','N','V'):   \
@@ -75,3 +82,15 @@ static inline int GetPackedYuvOffsets( vlc_fourcc_t i_chroma,
             return VLC_EGENERIC;
     }
 }
+
+/*****************************************************************************
+ *
+ *****************************************************************************/
+static inline picture_t *CopyInfoAndRelease( picture_t *p_outpic, picture_t *p_inpic )
+{
+    picture_CopyProperties( p_outpic, p_inpic );
+
+    picture_Release( p_inpic );
+
+    return p_outpic;
+}