[mythtv] FFMpeg merge breakage

[Nigel Pearson]

Slowly struggling to get OS X builds working after the merge.


At least one remaining problem from changing #ifdef BLAH to if(BLAH):

NuppelVideoRecorder.cpp: In member function 'int  
NuppelVideoRecorder::AudioInit(bool)':
NuppelVideoRecorder.cpp:704: error: 'SNDCTL_DSP_SETFRAGMENT' was not  
declared in this scope
NuppelVideoRecorder.cpp:706: error: 'AFMT_S16_LE' was not declared in  
this scope
NuppelVideoRecorder.cpp:707: error: 'SNDCTL_DSP_SETFMT' was not  
declared in this scope
NuppelVideoRecorder.cpp:715: error: 'SNDCTL_DSP_SAMPLESIZE' was not  
declared in this scope
NuppelVideoRecorder.cpp:716: error: 'SNDCTL_DSP_CHANNELS' was not  
declared in this scope
NuppelVideoRecorder.cpp:717: error: 'SNDCTL_DSP_SPEED' was not  
declared in this scope
NuppelVideoRecorder.cpp:728: error: 'SNDCTL_DSP_GETBLKSIZE' was not  
declared in this scope
NuppelVideoRecorder.cpp: In member function 'void  
NuppelVideoRecorder::doAudioThread()':
NuppelVideoRecorder.cpp:2265: error: 'audio_buf_info' was not  
declared in this scope
NuppelVideoRecorder.cpp:2265: error: expected `;' before 'ispace'
NuppelVideoRecorder.cpp:2283: error: 'SNDCTL_DSP_SETFRAGMENT' was not  
declared in this scope
NuppelVideoRecorder.cpp:2285: error: 'AFMT_S16_LE' was not declared  
in this scope
NuppelVideoRecorder.cpp:2286: error: 'SNDCTL_DSP_SETFMT' was not  
declared in this scope
NuppelVideoRecorder.cpp:2294: error: 'SNDCTL_DSP_SAMPLESIZE' was not  
declared in this scope
NuppelVideoRecorder.cpp:2295: error: 'SNDCTL_DSP_CHANNELS' was not  
declared in this scope
NuppelVideoRecorder.cpp:2296: error: 'SNDCTL_DSP_SPEED' was not  
declared in this scope
NuppelVideoRecorder.cpp:2308: error: 'SNDCTL_DSP_GETBLKSIZE' was not  
declared in this scope
NuppelVideoRecorder.cpp:2328: error: 'SNDCTL_DSP_SETTRIGGER' was not  
declared in this scope
NuppelVideoRecorder.cpp:2330: error: 'PCM_ENABLE_INPUT' was not  
declared in this scope
NuppelVideoRecorder.cpp:2368: error: 'SNDCTL_DSP_GETISPACE' was not  
declared in this scope
NuppelVideoRecorder.cpp:2368: error: 'ispace' was not declared in  
this scope


Assume its OK to revert that?

(the alternative is adding:

#if !defined(HAVE_SYS_SOUNDCARD_H) && !defined(HAVE_SOUNDCARD_H)
     #define SNDCTL_DSP_SETFRAGMENT 0
     #define AFMT_S16_LE 0
     #define SNDCTL_DSP_SETFMT 0
     #define SNDCTL_DSP_SAMPLESIZE 0
     #define SNDCTL_DSP_CHANNELS 0
     #define SNDCTL_DSP_SPEED 0
     #define SNDCTL_DSP_GETBLKSIZE 0
     #define SNDCTL_DSP_SETTRIGGER 0
     #define PCM_ENABLE_INPUT 0
     #define SNDCTL_DSP_GETISPACE 0
     typedef struct { int fragments, fragsize; } audio_buf_info;
#endif
)

--
Nigel Pearson, nigel at ind.tansu.com.au|"Things  you  own  |
Telstra Net. Eng., Sydney, Australia | end up owning you"|
Office: 9202 3900    Fax:  9212 6348 |      Tyler,       |
Mobile: 0408 664435  Home: 9792 6998 |    Fight Club     |