diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-12-16 10:12:15 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-12-16 10:12:15 -0300 |
| commit | 93a6ec1e32df7f8f6156f728fe3f82a69ee126ca (patch) | |
| tree | 7ce08b410e371a2ad70b5d8bc907c3127b99d4d1 /drivers/theora/video_stream_theora.cpp | |
| parent | f65eb470ae5d373a28921b648dbac962deb0b008 (diff) | |
| parent | ed1c4d83a603fc5193253ed4f09c8bfe66fc4b15 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'drivers/theora/video_stream_theora.cpp')
| -rw-r--r-- | drivers/theora/video_stream_theora.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/theora/video_stream_theora.cpp b/drivers/theora/video_stream_theora.cpp index 3c214ce48a..0659f007e5 100644 --- a/drivers/theora/video_stream_theora.cpp +++ b/drivers/theora/video_stream_theora.cpp @@ -642,7 +642,7 @@ void VideoStreamPlaybackTheora::update(float p_delta) { } } #ifdef THEORA_USE_THREAD_STREAMING - if (file && thread_eof && && (no_vorbis || no_theora) && ring_buffer.data_left()==0) { + if (file && thread_eof && (no_vorbis || no_theora) && ring_buffer.data_left()==0) { #else if (file && /*!videobuf_ready && */ (no_vorbis || no_theora) && file->eof_reached()) { #endif |