diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-04-28 11:04:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 11:04:05 +0200 |
| commit | 305b2a15bf1ed950e8e2ed50fa84456b584798fb (patch) | |
| tree | abaa1e01ca34382f4ea1d6e24c403ecff1502f39 /modules/theora | |
| parent | 7bca90769cbf7ae29023ca8d83ba7ab3137deda3 (diff) | |
| parent | 8247667a3ee0d86f26094e722497b0cbb99cc12b (diff) | |
Merge pull request #48239 from akien-mga/goodbye-copymem
Core: Drop custom `copymem`/`zeromem` defines
Diffstat (limited to 'modules/theora')
| -rw-r--r-- | modules/theora/video_stream_theora.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/theora/video_stream_theora.cpp b/modules/theora/video_stream_theora.cpp index 19f26c87cd..54f5b3f424 100644 --- a/modules/theora/video_stream_theora.cpp +++ b/modules/theora/video_stream_theora.cpp @@ -225,7 +225,7 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) { /* identify the codec: try theora */ if (!theora_p && th_decode_headerin(&ti, &tc, &ts, &op) >= 0) { /* it is theora */ - copymem(&to, &test, sizeof(test)); + memcpy(&to, &test, sizeof(test)); theora_p = 1; } else if (!vorbis_p && vorbis_synthesis_headerin(&vi, &vc, &op) >= 0) { /* it is vorbis */ @@ -238,7 +238,7 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) { audio_track_skip--; } else { - copymem(&vo, &test, sizeof(test)); + memcpy(&vo, &test, sizeof(test)); vorbis_p = 1; } } else { |