RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove a memory allocation and the associated memcpy.

This commit is contained in:
Sven C. Dack 2011-03-30 17:02:29 +02:00 committed by Carl Eugen Hoyos
parent 007b1f04d7
commit 39530272c5
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavdevice/x11grab.c
View File

@ -386,10 +386,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) {
@ -406,9 +405,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;
} }