diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-15 17:33:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 17:33:06 +0200 |
| commit | 1efe7093bec9c0bfaa2ecedd9d5777b594d7283a (patch) | |
| tree | 72607a5938fa106e90ef835784ee48df1e73732f /scene | |
| parent | 3f888966c0311a49541d6eb952b5a76d105f59d5 (diff) | |
| parent | ae74e78909ae0bc476112fb43b9580e969879dcd (diff) | |
Merge pull request #53833 from akien-mga/remove-webm-support
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/video_player.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/video_player.cpp b/scene/gui/video_player.cpp index 8734037a57..989aabc549 100644 --- a/scene/gui/video_player.cpp +++ b/scene/gui/video_player.cpp @@ -29,9 +29,9 @@ /*************************************************************************/ #include "video_player.h" -#include "scene/scene_string_names.h" #include "core/os/os.h" +#include "scene/scene_string_names.h" #include "servers/audio_server.h" int VideoPlayer::sp_get_channel_count() const { @@ -55,7 +55,7 @@ bool VideoPlayer::mix(AudioFrame *p_buffer, int p_frames) { return false; } -// Called from main thread (eg VideoStreamPlaybackWebm::update) +// Called from main thread (e.g. VideoStreamPlaybackTheora::update). int VideoPlayer::_audio_mix_callback(void *p_udata, const float *p_data, int p_frames) { ERR_FAIL_NULL_V(p_udata, 0); ERR_FAIL_NULL_V(p_data, 0); |