[FFmpeg-cvslog] avdevice: Use av_format_get_control_message_cb()
Michael Niedermayer
git at videolan.org
Fri Jan 16 02:59:24 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 16 02:10:35 2015 +0100| [ba97cf2c4562b60fbef89103b61516891e31845e] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba97cf2c4562b60fbef89103b61516891e31845e
---
libavdevice/avdevice.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c
index 72e1b67..01c4692 100644
--- 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 (!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,
More information about the ffmpeg-cvslog
mailing list