OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4184d34
)
avdevice: Use av_format_get_control_message_cb()
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 16 Jan 2015 01:10:35 +0000
(
02:10
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 16 Jan 2015 01:13:01 +0000
(
02:13
+0100)
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>
libavdevice/avdevice.c
patch
|
blob
|
history
diff --git
a/libavdevice/avdevice.c
b/libavdevice/avdevice.c
index
72e1b67
..
01c4692
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 (!
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,