From f29e7b74366d0ddaf73feca266cacf632521e2bd Mon Sep 17 00:00:00 2001 From: stan Date: Fri, 20 Mar 2009 11:33:05 +0000 Subject: [PATCH] Commented out recent redundant pix_format definitions git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2808 e3e1d417-86f3-4887-817a-d78f3d33393f --- src/zm_local_camera.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/zm_local_camera.cpp b/src/zm_local_camera.cpp index 3ae326526..4720509e7 100644 --- a/src/zm_local_camera.cpp +++ b/src/zm_local_camera.cpp @@ -158,10 +158,9 @@ static PixelFormat getFfPixFormatFromV4lPalette( int v4l_version, int palette ) pixFormat = PIX_FMT_YUV440P; pixFormat = PIX_FMT_YUVJ440P; pixFormat = PIX_FMT_YUVA420P; - pixFormat = PIX_FMT_VDPAU_H264; - pixFormat = PIX_FMT_VDPAU_MPEG1; - pixFormat = PIX_FMT_VDPAU_MPEG2; - pixFormat = PIX_FMT_NB; + //pixFormat = PIX_FMT_VDPAU_H264; + //pixFormat = PIX_FMT_VDPAU_MPEG1; + //pixFormat = PIX_FMT_VDPAU_MPEG2; } } } @@ -225,9 +224,9 @@ static PixelFormat getFfPixFormatFromV4lPalette( int v4l_version, int palette ) pixFormat = PIX_FMT_YUV440P; pixFormat = PIX_FMT_YUVJ440P; pixFormat = PIX_FMT_YUVA420P; - pixFormat = PIX_FMT_VDPAU_H264; - pixFormat = PIX_FMT_VDPAU_MPEG1; - pixFormat = PIX_FMT_VDPAU_MPEG2; + //pixFormat = PIX_FMT_VDPAU_H264; + //pixFormat = PIX_FMT_VDPAU_MPEG1; + //pixFormat = PIX_FMT_VDPAU_MPEG2; } } }