Skip to content

F
ffmpeg.wasm-core
Commit 2f2c6040 authored by Sven C. Dack's avatar Sven C. Dack Committed by Anton Khirnov
Browse files
Options

x11grab: remove a memory allocation and the associated memcpy. 

Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
parent 151c5841
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
libavdevice/x11grab.c
View file @ 2f2c6040
...@@ -410,10 +410,9 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt) ...@@ -410,10 +410,9 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
nanosleep(&ts, NULL); nanosleep(&ts, NULL);
} }
if (av_new_packet(pkt, s->frame_size) < 0) { av_init_packet(pkt);
return AVERROR(EIO); pkt->data = image->data;
} pkt->size = s->frame_size;
pkt->pts = curtime; pkt->pts = curtime;
if(s->use_shm) { if(s->use_shm) {
...@@ -430,9 +429,6 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt) ...@@ -430,9 +429,6 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
paint_mouse_pointer(image, s); paint_mouse_pointer(image, s);
} }
/* XXX: avoid memcpy */
memcpy(pkt->data, image->data, s->frame_size);
return s->frame_size; return s->frame_size;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment