virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '58396e806c65fe0eb00e6ccf1980f810cdceed05'

Browse Source 
* commit '58396e806c65fe0eb00e6ccf1980f810cdceed05':
  x11grab: Use a typedef for the context, as most other code does

Conflicts:
	libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-28 22:06:48 +02:00
parent 1fc3963188 58396e806c
commit c6a3b00924
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavdevice/x11grab.c
View File

@@ -62,7 +62,7 @@
#include "libavformat/internal.h" #include "libavformat/internal.h"
/** X11 device demuxer context */ /** X11 device demuxer context */
struct x11grab { typedef struct X11GrabContext {
const AVClass *class; /**< Class for private options. */ const AVClass *class; /**< Class for private options. */
int frame_size; /**< Size in bytes of a grabbed frame */ int frame_size; /**< Size in bytes of a grabbed frame */
AVRational time_base; /**< Time base */ AVRational time_base; /**< Time base */
@@ -86,7 +86,7 @@ struct x11grab {
Cursor c; Cursor c;
Window region_win; /**< This is used by show_region option. */ Window region_win; /**< This is used by show_region option. */
}; } X11GrabContext;
#define REGION_WIN_BORDER 3 #define REGION_WIN_BORDER 3
@@ -95,7 +95,7 @@ struct x11grab {
* *
* @param s x11grab context * @param s x11grab context
*/ */
static void x11grab_draw_region_win(struct x11grab *s) static void x11grab_draw_region_win(X11GrabContext *s)
{ {
Display *dpy = s->dpy; Display *dpy = s->dpy;
Window win = s->region_win; Window win = s->region_win;
@@ -116,7 +116,7 @@ static void x11grab_draw_region_win(struct x11grab *s)
* *
* @param s x11grab context * @param s x11grab context
*/ */
static void x11grab_region_win_init(struct x11grab *s) static void x11grab_region_win_init(X11GrabContext *s)
{ {
Display *dpy = s->dpy; Display *dpy = s->dpy;
XRectangle rect; XRectangle rect;
@@ -155,7 +155,7 @@ static void x11grab_region_win_init(struct x11grab *s)
*/ */
static int x11grab_read_header(AVFormatContext *s1) static int x11grab_read_header(AVFormatContext *s1)
{ {
struct x11grab *x11grab = s1->priv_data; X11GrabContext *x11grab = s1->priv_data;
Display *dpy; Display *dpy;
AVStream *st = NULL; AVStream *st = NULL;
enum AVPixelFormat input_pixfmt; enum AVPixelFormat input_pixfmt;
@@ -366,7 +366,7 @@ out:
*/ */
static void paint_mouse_pointer(XImage *image, AVFormatContext *s1) static void paint_mouse_pointer(XImage *image, AVFormatContext *s1)
{ {
struct x11grab *s = s1->priv_data; X11GrabContext *s = s1->priv_data;
int x_off = s->x_off; int x_off = s->x_off;
int y_off = s->y_off; int y_off = s->y_off;
int width = s->width; int width = s->width;
@@ -489,7 +489,7 @@ static int xget_zpixmap(Display *dpy, Drawable d, XImage *image, int x, int y)
*/ */
static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt) static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
{ {
struct x11grab *s = s1->priv_data; X11GrabContext *s = s1->priv_data;
Display *dpy = s->dpy; Display *dpy = s->dpy;
XImage *image = s->image; XImage *image = s->image;
int x_off = s->x_off; int x_off = s->x_off;
@@ -604,7 +604,7 @@ static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
*/ */
static int x11grab_read_close(AVFormatContext *s1) static int x11grab_read_close(AVFormatContext *s1)
{ {
struct x11grab *x11grab = s1->priv_data; X11GrabContext *x11grab = s1->priv_data;
/* Detach cleanly from shared mem */ /* Detach cleanly from shared mem */
if (x11grab->use_shm) { if (x11grab->use_shm) {
@@ -627,7 +627,7 @@ static int x11grab_read_close(AVFormatContext *s1)
return 0; return 0;
} }
#define OFFSET(x) offsetof(struct x11grab, x) #define OFFSET(x) offsetof(X11GrabContext, x)
#define DEC AV_OPT_FLAG_DECODING_PARAM #define DEC AV_OPT_FLAG_DECODING_PARAM
static const AVOption options[] = { static const AVOption options[] = {
{ "draw_mouse", "draw the mouse pointer", OFFSET(draw_mouse), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, DEC }, { "draw_mouse", "draw the mouse pointer", OFFSET(draw_mouse), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, DEC },
@@ -656,7 +656,7 @@ static const AVClass x11_class = {
AVInputFormat ff_x11grab_demuxer = { AVInputFormat ff_x11grab_demuxer = {
.name = "x11grab", .name = "x11grab",
.long_name = NULL_IF_CONFIG_SMALL("X11grab"), .long_name = NULL_IF_CONFIG_SMALL("X11grab"),
.priv_data_size = sizeof(struct x11grab), .priv_data_size = sizeof(X11GrabContext),
.read_header = x11grab_read_header, .read_header = x11grab_read_header,
.read_packet = x11grab_read_packet, .read_packet = x11grab_read_packet,
.read_close = x11grab_read_close, .read_close = x11grab_read_close,