aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-16 02:10:35 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-12 17:10:35 +0100
commite3b6144e0c51f61ea509f8ef79a0769068b6b059 (patch)
tree620dd647cc0950f87c74dba1815f96ef3798f169
parent8acbba0ec3b267512842537011172457c57361ba (diff)
downloadffmpeg-e3b6144e0c51f61ea509f8ef79a0769068b6b059.tar.gz
avdevice: Use av_format_get_control_message_cb()
This is required as the location of this field could change and is specified in libavformat not avdevice Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ba97cf2c4562b60fbef89103b61516891e31845e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavdevice/avdevice.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c
index c68126faa3..844b20089c 100644
--- a/libavdevice/avdevice.c
+++ b/libavdevice/avdevice.c
@@ -134,9 +134,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 (!s->control_message_cb)
+ if (!av_format_get_control_message_cb(s))
return AVERROR(ENOSYS);
- return s->control_message_cb(s, type, data, data_size);
+ return av_format_get_control_message_cb(s)(s, type, data, data_size);
}
int avdevice_capabilities_create(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s,