Merge commit 'ecc5c4db2dd3a0f328d95df89daa59f78b4b2810'

[ffmpeg] / libavdevice / avdevice.c

diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c
index 01c46924d10a08a21d74cfbc607cf459a0fba855..72e1b67887f9bc7d9e63822e17fa63a29e33d0d4 100644 (file)
--- a/libavdevice/avdevice.c
+++ b/libavdevice/avdevice.c
@@ -135,9 +135,9 @@ int avdevice_app_to_dev_control_message(struct AVFormatContext *s, enum AVAppToD
 int avdevice_dev_to_app_control_message(struct AVFormatContext *s, enum AVDevToAppMessageType type,
                                         void *data, size_t data_size)
 {
-    if (!av_format_get_control_message_cb(s))
+    if (!s->control_message_cb)
         return AVERROR(ENOSYS);
-    return av_format_get_control_message_cb(s)(s, type, data, data_size);
+    return s->control_message_cb(s, type, data, data_size);
 }
 
 int avdevice_capabilities_create(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s,