diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-29 03:56:31 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-29 04:16:26 +0400 |
commit | 706bd8ea19a6f723795547885714033ac68a4d74 (patch) | |
tree | 39f7933c9432b35801c81903fa7dc352de92fe95 /libavdevice/x11grab.c | |
parent | 0f8f9248471bbee5649c8efdc52d02c1cf93bba1 (diff) | |
parent | c83f44dba11930744e167856b48fbc24a8ff0e63 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (35 commits)
h264_idct_10bit: port x86 assembly to cpuflags.
x86inc: clip num_args to 7 on x86-32.
x86inc: sync to latest version from x264.
fft: rename "z" to "zc" to prevent name collision.
wv: return meaningful error codes.
wv: return AVERROR_EOF on EOF, not EIO.
mp3dec: forward errors for av_get_packet().
mp3dec: remove a pointless local variable.
mp3dec: remove commented out cruft.
lavfi: bump minor to mark stabilizing the ABI.
FATE: add tests for yadif.
FATE: add a test for delogo video filter.
FATE: add a test for amix audio filter.
audiogen: allow specifying random seed as a commandline parameter.
vc1dec: Override invalid macroblock quantizer
vc1: avoid reading beyond the last line in vc1_draw_sprites()
vc1dec: check that coded slice positions and interlacing match.
vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value
configure: Move parts that should not be user-selectable to CONFIG_EXTRA
lavf: remove commented out cruft in avformat_find_stream_info()
...
Conflicts:
Makefile
configure
libavcodec/vc1dec.c
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264dsp_mmx.c
libavfilter/version.h
libavformat/mp3dec.c
libavformat/utils.c
libavformat/wv.c
libavutil/x86/x86inc.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/x11grab.c')
-rw-r--r-- | libavdevice/x11grab.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index cc9268ec9a..6202bbc3f4 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -41,6 +41,7 @@ #include "libavutil/log.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" +#include "libavutil/time.h" #include <time.h> #include <X11/X.h> #include <X11/Xlib.h> @@ -56,8 +57,7 @@ /** * X11 Device Demuxer context */ -struct x11_grab -{ +struct x11grab { const AVClass *class; /**< Class for private options. */ int frame_size; /**< Size in bytes of a grabbed frame */ AVRational time_base; /**< Time base */ @@ -84,10 +84,10 @@ struct x11_grab /** * Draw grabbing region window * - * @param s x11_grab context + * @param s x11grab context */ static void -x11grab_draw_region_win(struct x11_grab *s) +x11grab_draw_region_win(struct x11grab *s) { Display *dpy = s->dpy; int screen; @@ -109,10 +109,10 @@ x11grab_draw_region_win(struct x11_grab *s) /** * Initialize grabbing region window * - * @param s x11_grab context + * @param s x11grab context */ static void -x11grab_region_win_init(struct x11_grab *s) +x11grab_region_win_init(struct x11grab *s) { Display *dpy = s->dpy; int screen; @@ -154,7 +154,7 @@ x11grab_region_win_init(struct x11_grab *s) static int x11grab_read_header(AVFormatContext *s1) { - struct x11_grab *x11grab = s1->priv_data; + struct x11grab *x11grab = s1->priv_data; Display *dpy; AVStream *st = NULL; enum PixelFormat input_pixfmt; @@ -330,7 +330,7 @@ out: * coordinates */ static void -paint_mouse_pointer(XImage *image, struct x11_grab *s) +paint_mouse_pointer(XImage *image, struct x11grab *s) { int x_off = s->x_off; int y_off = s->y_off; @@ -444,7 +444,7 @@ xget_zpixmap(Display *dpy, Drawable d, XImage *image, int x, int y) static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt) { - struct x11_grab *s = s1->priv_data; + struct x11grab *s = s1->priv_data; Display *dpy = s->dpy; XImage *image = s->image; int x_off = s->x_off; @@ -554,7 +554,7 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt) static int x11grab_read_close(AVFormatContext *s1) { - struct x11_grab *x11grab = s1->priv_data; + struct x11grab *x11grab = s1->priv_data; /* Detach cleanly from shared mem */ if (x11grab->use_shm) { @@ -578,7 +578,7 @@ x11grab_read_close(AVFormatContext *s1) return 0; } -#define OFFSET(x) offsetof(struct x11_grab, x) +#define OFFSET(x) offsetof(struct x11grab, x) #define DEC AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { { "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str = "vga"}, 0, 0, DEC }, @@ -599,10 +599,10 @@ static const AVClass x11_class = { }; /** x11 grabber device demuxer declaration */ -AVInputFormat ff_x11_grab_device_demuxer = { +AVInputFormat ff_x11grab_demuxer = { .name = "x11grab", .long_name = NULL_IF_CONFIG_SMALL("X11grab"), - .priv_data_size = sizeof(struct x11_grab), + .priv_data_size = sizeof(struct x11grab), .read_header = x11grab_read_header, .read_packet = x11grab_read_packet, .read_close = x11grab_read_close, |