diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-05-04 23:38:10 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-04 23:38:10 -0300 |
| commit | cb93e064a9378af3b8a31cae43aa55f3cd4168f2 (patch) | |
| tree | b0f830b9682bb585b055e38ed902d963e2e9cfea /drivers | |
| parent | 68700ee3a98298709371c5b970c3083ef534faac (diff) | |
| parent | dce8a6c251d4da24d70cab6033753895716bc998 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/theoraplayer/video_stream_theoraplayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/theoraplayer/video_stream_theoraplayer.cpp b/drivers/theoraplayer/video_stream_theoraplayer.cpp index ecafda9d84..ef1f5651ab 100644 --- a/drivers/theoraplayer/video_stream_theoraplayer.cpp +++ b/drivers/theoraplayer/video_stream_theoraplayer.cpp @@ -388,7 +388,7 @@ void VideoStreamTheoraplayer::pop_frame(Ref<ImageTexture> p_tex) { { DVector<uint8_t>::Write wr = data.write(); uint8_t* ptr = wr.ptr(); - memcpy(ptr, f->getBuffer(), imgsize); + copymem(ptr, f->getBuffer(), imgsize); } /* for (int i=0; i<h; i++) { |