[FFmpeg-devel] [PATCH] lavd/dshow: Add namespace prefix to global functions

[James Almer]

On 1/21/2021 7:52 PM, Mark Thompson wrote:
> On 25/06/2018 19:47, Mark Thompson wrote:
>> ---
>> Not tested at all.
>>
>>   libavdevice/dshow.c          | 6 +++---
>>   libavdevice/dshow_capture.h  | 4 ++--
>>   libavdevice/dshow_crossbar.c | 8 ++++----
>>   3 files changed, 9 insertions(+), 9 deletions(-)
>>
>> diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
>> index de910c0994..6f613f31b0 100644
>> --- a/libavdevice/dshow.c
>> +++ b/libavdevice/dshow.c
>> @@ -509,7 +509,7 @@ end:
>>    * Pops up a user dialog allowing them to adjust properties for the 
>> given filter, if possible.
>>    */
>>   void
>> -dshow_show_filter_properties(IBaseFilter *device_filter, 
>> AVFormatContext *avctx) {
>> +ff_dshow_show_filter_properties(IBaseFilter *device_filter, 
>> AVFormatContext *avctx) {
>>       ISpecifyPropertyPages *property_pages = NULL;
>>       IUnknown *device_filter_iunknown = NULL;
>>       HRESULT hr;
>> @@ -581,7 +581,7 @@ dshow_cycle_pins(AVFormatContext *avctx, enum 
>> dshowDeviceType devtype,
>>       int should_show_properties = (devtype == VideoDevice) ? 
>> ctx->show_video_device_dialog : ctx->show_audio_device_dialog;
>>       if (should_show_properties)
>> -        dshow_show_filter_properties(device_filter, avctx);
>> +        ff_dshow_show_filter_properties(device_filter, avctx);
>>       r = IBaseFilter_EnumPins(device_filter, &pins);
>>       if (r != S_OK) {
>> @@ -886,7 +886,7 @@ dshow_open_device(AVFormatContext *avctx, 
>> ICreateDevEnum *devenum,
>>           goto error;
>>       }
>> -    r = dshow_try_setup_crossbar_options(graph_builder2, 
>> device_filter, devtype, avctx);
>> +    r = ff_dshow_try_setup_crossbar_options(graph_builder2, 
>> device_filter, devtype, avctx);
>>       if (r != S_OK) {
>>           av_log(avctx, AV_LOG_ERROR, "Could not setup CrossBar\n");
>> diff --git a/libavdevice/dshow_capture.h b/libavdevice/dshow_capture.h
>> index 475d62ba99..79c004a87f 100644
>> --- a/libavdevice/dshow_capture.h
>> +++ b/libavdevice/dshow_capture.h
>> @@ -346,9 +346,9 @@ struct dshow_ctx {
>>   
>> /***************************************************************************** 
>>
>>    * CrossBar
>>    
>> ****************************************************************************/ 
>>
>> -HRESULT dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 
>> *graph_builder2,
>> +HRESULT ff_dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 
>> *graph_builder2,
>>       IBaseFilter *device_filter, enum dshowDeviceType devtype, 
>> AVFormatContext *avctx);
>> -void dshow_show_filter_properties(IBaseFilter *pFilter, 
>> AVFormatContext *avctx);
>> +void ff_dshow_show_filter_properties(IBaseFilter *pFilter, 
>> AVFormatContext *avctx);
>>   #endif /* AVDEVICE_DSHOW_CAPTURE_H */
>> diff --git a/libavdevice/dshow_crossbar.c b/libavdevice/dshow_crossbar.c
>> index 95fb466f4e..2438683cde 100644
>> --- a/libavdevice/dshow_crossbar.c
>> +++ b/libavdevice/dshow_crossbar.c
>> @@ -137,7 +137,7 @@ setup_crossbar_options(IAMCrossbar *cross_bar, 
>> enum dshowDeviceType devtype, AVF
>>    * Given a fully constructed graph, check if there is a cross bar 
>> filter, and configure its pins if so.
>>    */
>>   HRESULT
>> -dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2,
>> +ff_dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 
>> *graph_builder2,
>>       IBaseFilter *device_filter, enum dshowDeviceType devtype, 
>> AVFormatContext *avctx)
>>   {
>>       struct dshow_ctx *ctx = avctx->priv_data;
>> @@ -163,7 +163,7 @@ 
>> dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2,
>>           hr = IAMCrossbar_QueryInterface(cross_bar, &IID_IBaseFilter, 
>> (void **) &cross_bar_base_filter);
>>           if (hr != S_OK)
>>               goto end;
>> -        dshow_show_filter_properties(cross_bar_base_filter, avctx);
>> +        ff_dshow_show_filter_properties(cross_bar_base_filter, avctx);
>>       }
>>       if (devtype == VideoDevice && ctx->show_analog_tv_tuner_dialog) {
>> @@ -173,7 +173,7 @@ 
>> dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2,
>>               hr = IAMCrossbar_QueryInterface(tv_tuner_filter, 
>> &IID_IBaseFilter, (void **) &tv_tuner_base_filter);
>>               if (hr != S_OK)
>>                   goto end;
>> -            dshow_show_filter_properties(tv_tuner_base_filter, avctx);
>> +            ff_dshow_show_filter_properties(tv_tuner_base_filter, 
>> avctx);
>>           } else {
>>               av_log(avctx, AV_LOG_WARNING, "unable to find a tv tuner 
>> to display dialog for!");
>>           }
>> @@ -185,7 +185,7 @@ 
>> dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2,
>>               hr = IAMCrossbar_QueryInterface(tv_audio_filter, 
>> &IID_IBaseFilter, (void **) &tv_audio_base_filter);
>>               if (hr != S_OK)
>>                   goto end;
>> -            dshow_show_filter_properties(tv_audio_base_filter, avctx);
>> +            ff_dshow_show_filter_properties(tv_audio_base_filter, 
>> avctx);
>>           } else {
>>               av_log(avctx, AV_LOG_WARNING, "unable to find a tv audio 
>> tuner to display dialog for!");
>>           }
>>
> 
> Ping.  (30 months is a good time to wait, right?)

It just needed time to marinate, is all :p

Applied.