[asterisk-commits] rizzo: branch rizzo/video_v2 r84129 - /team/rizzo/video_v2/channels/

[SVN commits to the Asterisk project]

Author: rizzo
Date: Sat Sep 29 13:14:47 2007
New Revision: 84129

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84129
Log:
make this build in AST_DEVMODE when OLD_FFMPEG is not defined.

Modified:
    team/rizzo/video_v2/channels/console_video.c

Modified: team/rizzo/video_v2/channels/console_video.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/video_v2/channels/console_video.c?view=diff&rev=84129&r1=84128&r2=84129
==============================================================================
--- team/rizzo/video_v2/channels/console_video.c (original)
+++ team/rizzo/video_v2/channels/console_video.c Sat Sep 29 13:14:47 2007
@@ -21,7 +21,7 @@
 #define HAVE_V4L	1
 #define HAVE_SDL	1
 #define HAVE_FFMPEG	1
-#define OLD_FFMPEG	1	/* set for old ffmpeg with no swscale */
+//#define OLD_FFMPEG	1	/* set for old ffmpeg with no swscale */
 
 
 #if !defined(HAVE_FFMPEG)
@@ -859,6 +859,7 @@
 	img_convert(p_out, out->pix_fmt,
 		p_in, in->pix_fmt, in->w, in->h);
 #else /* XXX replacement */
+    {
 	struct SwsContext *convert_ctx;
 
 	convert_ctx = sws_getContext(in->w, in->h, in->pix_fmt,
@@ -875,6 +876,7 @@
 		p_out->data, p_out->linesize);
 
 	sws_freeContext(convert_ctx);
+    }
 #endif /* XXX replacement */
 }