avformat/mpegtsenc: Fix mpegts_write_pes() for private_stream_2 and other types

[ffmpeg] / libavdevice / dshow_crossbar.c

diff --git a/libavdevice/dshow_crossbar.c b/libavdevice/dshow_crossbar.c
index 95fb466f4e5d3623e3af9769fb23d1be3c084372..2438683cde8a5908d5893b9945380e95c3626d90 100644 (file)
--- 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!");
         }