[FFmpeg-cvslog] lavd/x11grab: deprecate "nomouse" specification in filename

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Wed Aug  8 11:19:14 2012 +0200| [4270d8c04d354b928d2329abd1037c6f0a72c07f] | committer: Stefano Sabatini

lavd/x11grab: deprecate "nomouse" specification in filename

Favor draw_mouse option. Should simplify parsing, and make it more
robust.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4270d8c04d354b928d2329abd1037c6f0a72c07f
---

 libavdevice/x11grab.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 14fabee..68e2e0f 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -174,7 +174,12 @@ x11grab_read_header(AVFormatContext *s1)
     offset = strchr(dpyname, '+');
     if (offset) {
         sscanf(offset, "%d,%d", &x_off, &y_off);
-        x11grab->draw_mouse = !strstr(offset, "nomouse");
+        if (strstr(offset, "nomouse")) {
+            av_log(s1, AV_LOG_WARNING,
+                   "'nomouse' specification in argument is deprecated: "
+                   "use 'draw_mouse' option with value 0 instead\n");
+            x11grab->draw_mouse = 0;
+        }
         *offset= 0;
     }