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

[SVN commits to the Asterisk project]

Author: rizzo
Date: Sat Sep 15 12:03:16 2007
New Revision: 82491

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82491
Log:
clarify which version of ffmpeg we use and the kind of warnings
can occur with older versions.
TODO: let configure find out.


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=82491&r1=82490&r2=82491
==============================================================================
--- team/rizzo/video_v2/channels/console_video.c (original)
+++ team/rizzo/video_v2/channels/console_video.c Sat Sep 15 12:03:16 2007
@@ -9,8 +9,14 @@
 #define HAVE_V4L	1
 #define HAVE_SDL	1
 #define HAVE_FFMPEG	1
-#define OLD_FFMPEG	1	/* set if no swscale */
-
+//#define OLD_FFMPEG	1	/* set if no swscale */
+
+/*
+ * You need a recent (2007.07.12 or so) version of ffmpeg to avoid warning.
+ * Older versions might give 'deprecated' messages during compilation,
+ * thus not compiling in AST_DEVMODE, or don't have swscale, in which case
+ * you can try to compile #defining OLD_FFMPEG here.
+ */
 #if !defined(HAVE_FFMPEG) || HAVE_FFMPEG == 0 || !defined(HAVE_SDL) || HAVE_SDL == 0
 /* stubs for everything */
 struct video_desc {	/* empty */
@@ -675,7 +681,7 @@
 			bcopy(env->out.buf.data + 5*l4, bmp->pixels[1], l4);
 		}
 	} else {	/* decode */
-#if OLD_FFMPEG /* XXX img_convert is deprecated */
+#ifdef OLD_FFMPEG /* XXX img_convert is deprecated */
 		/* env->initialized guarantees that in.frame exists */
 		img_convert(&pict, PIX_FMT_YUV420P, (AVPicture *)env->in.frame, c->pix_fmt, c->width, c->height);
 #else /* XXX replacement */