Commit 9419f639 authored by Ken Martin's avatar Ken Martin
Browse files

Fix a mior warning about initializer order

Just quiet a -Wreorder warning on safety for ffmpeg
parent b81e3647
......@@ -158,14 +158,22 @@ protected:
vtkFFMPEGVideoSource();
~vtkFFMPEGVideoSource();
int DecodingThreads;
AudioCallbackType AudioCallback;
void *AudioCallbackClientData;
void ReadFrame();
int DecodingThreads;
vtkFFMPEGVideoSourceInternal *Internal;
static void *DrainAudioThread(
vtkMultiThreader::ThreadInfo *data);
void *DrainAudio(vtkMultiThreader::ThreadInfo *data);
int DrainAudioThreadId;
static void *DrainThread(
vtkMultiThreader::ThreadInfo *data);
void *Drain(vtkMultiThreader::ThreadInfo *data);
int DrainThreadId;
bool EndOfFile;
vtkNew<vtkConditionVariable> FeedCondition;
vtkNew<vtkMutexLock> FeedMutex;
......@@ -176,18 +184,11 @@ protected:
void *Feed(vtkMultiThreader::ThreadInfo *data);
int FeedThreadId;
static void *DrainAudioThread(
vtkMultiThreader::ThreadInfo *data);
void *DrainAudio(vtkMultiThreader::ThreadInfo *data);
int DrainAudioThreadId;
char *FileName;
static void *DrainThread(
vtkMultiThreader::ThreadInfo *data);
void *Drain(vtkMultiThreader::ThreadInfo *data);
int DrainThreadId;
vtkFFMPEGVideoSourceInternal *Internal;
char *FileName;
bool EndOfFile;
void ReadFrame();
private:
vtkFFMPEGVideoSource(const vtkFFMPEGVideoSource&) = delete;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment