Support MBAFF + constrained intra prediction.

[ffmpeg.git] / libavdevice / x11grab.c

diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 61c1435..4e1a499 100644 (file)
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -35,11 +35,11 @@
  * and Edouard Gomez <ed.gomez@free.fr>.
  */
 
-#include "avformat.h"
+#include "config.h"
+#include "libavformat/avformat.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/time.h>
 #define _LINUX_TIME_H 1
 #include <time.h>
@@ -113,7 +113,7 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
     }
 
     if (!ap || ap->width <= 0 || ap->height <= 0 || ap->time_base.den <= 0) {
-        av_log(s1, AV_LOG_ERROR, "AVParameters don't have any video size. Use -s.\n");
+        av_log(s1, AV_LOG_ERROR, "AVParameters don't have video size and/or rate. Use -s and -r.\n");
         return AVERROR(EIO);
     }
 
@@ -299,7 +299,7 @@ apply_masks(uint8_t *dst, int and, int or, int bits_per_pixel)
 /**
  * Paints a mouse pointer in an X11 image.
  *
- * @param image Image where to paint the mouse pointer
+ * @param image image to paint the mouse pointer to
  * @param s context used to retrieve original grabbing rectangle
  *          coordinates
  * @param x Mouse pointer coordinate
@@ -519,7 +519,7 @@ x11grab_read_close(AVFormatContext *s1)
 AVInputFormat x11_grab_device_demuxer =
 {
     "x11grab",
-    "X11grab",
+    NULL_IF_CONFIG_SMALL("X11grab"),
     sizeof(x11_grab_t),
     NULL,
     x11grab_read_header,