RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavd/dshow: Add namespace prefix to global functions

This commit is contained in:
Mark Thompson 2018-06-25 19:47:03 +01:00 committed by James Almer
parent 43c8d3097b
commit c154aada45
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavdevice/dshow.c
View File

@ -510,7 +510,7 @@ end:
* Pops up a user dialog allowing them to adjust properties for the given filter, if possible. * Pops up a user dialog allowing them to adjust properties for the given filter, if possible.
*/ */
void void
dshow_show_filter_properties(IBaseFilter *device_filter, AVFormatContext *avctx) { ff_dshow_show_filter_properties(IBaseFilter *device_filter, AVFormatContext *avctx) {
ISpecifyPropertyPages *property_pages = NULL; ISpecifyPropertyPages *property_pages = NULL;
IUnknown *device_filter_iunknown = NULL; IUnknown *device_filter_iunknown = NULL;
HRESULT hr; HRESULT hr;
@ -582,7 +582,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; int should_show_properties = (devtype == VideoDevice) ? ctx->show_video_device_dialog : ctx->show_audio_device_dialog;
if (should_show_properties) 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); r = IBaseFilter_EnumPins(device_filter, &pins);
if (r != S_OK) { if (r != S_OK) {
@ -887,7 +887,7 @@ dshow_open_device(AVFormatContext *avctx, ICreateDevEnum *devenum,
goto error; 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) { if (r != S_OK) {
av_log(avctx, AV_LOG_ERROR, "Could not setup CrossBar\n"); av_log(avctx, AV_LOG_ERROR, "Could not setup CrossBar\n");

4
libavdevice/dshow_capture.h
View File

@ -346,9 +346,9 @@ struct dshow_ctx {
/***************************************************************************** /*****************************************************************************
* CrossBar * 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); 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 */ #endif /* AVDEVICE_DSHOW_CAPTURE_H */

8
libavdevice/dshow_crossbar.c
View File

@ -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. * Given a fully constructed graph, check if there is a cross bar filter, and configure its pins if so.
*/ */
HRESULT 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) IBaseFilter *device_filter, enum dshowDeviceType devtype, AVFormatContext *avctx)
{ {
struct dshow_ctx *ctx = avctx->priv_data; 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); hr = IAMCrossbar_QueryInterface(cross_bar, &IID_IBaseFilter, (void **) &cross_bar_base_filter);
if (hr != S_OK) if (hr != S_OK)
goto end; 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) { 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); hr = IAMCrossbar_QueryInterface(tv_tuner_filter, &IID_IBaseFilter, (void **) &tv_tuner_base_filter);
if (hr != S_OK) if (hr != S_OK)
goto end; goto end;
dshow_show_filter_properties(tv_tuner_base_filter, avctx); ff_dshow_show_filter_properties(tv_tuner_base_filter, avctx);
} else { } else {
av_log(avctx, AV_LOG_WARNING, "unable to find a tv tuner to display dialog for!"); 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); hr = IAMCrossbar_QueryInterface(tv_audio_filter, &IID_IBaseFilter, (void **) &tv_audio_base_filter);
if (hr != S_OK) if (hr != S_OK)
goto end; goto end;
dshow_show_filter_properties(tv_audio_base_filter, avctx); ff_dshow_show_filter_properties(tv_audio_base_filter, avctx);
} else { } else {
av_log(avctx, AV_LOG_WARNING, "unable to find a tv audio tuner to display dialog for!"); av_log(avctx, AV_LOG_WARNING, "unable to find a tv audio tuner to display dialog for!");
} }