summaryrefslogtreecommitdiff
path: root/libavdevice/libdc1394.c
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gmail.com>2011-01-25 22:03:28 +0000
committerMichael Niedermayer <michaelni@gmx.at>2011-01-28 03:15:34 +0100
commit66355be3c3eb8e797589058b0773f773a8c2231e (patch)
tree8dfe2254904eafda194acc98c465bf2ece7f69a6 /libavdevice/libdc1394.c
parentebf3ee16c765811fe3ab0c8a295ada0e2f5eca44 (diff)
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts. (cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca)
Diffstat (limited to 'libavdevice/libdc1394.c')
-rw-r--r--libavdevice/libdc1394.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c
index 1f35135a65..abd82dc981 100644
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@ -348,7 +348,7 @@ static int dc1394_v2_close(AVFormatContext * context)
return 0;
}
-AVInputFormat libdc1394_demuxer = {
+AVInputFormat ff_libdc1394_demuxer = {
.name = "libdc1394",
.long_name = NULL_IF_CONFIG_SMALL("dc1394 v.2 A/V grab"),
.priv_data_size = sizeof(struct dc1394_data),
@@ -360,7 +360,7 @@ AVInputFormat libdc1394_demuxer = {
#endif
#if HAVE_LIBDC1394_1
-AVInputFormat libdc1394_demuxer = {
+AVInputFormat ff_libdc1394_demuxer = {
.name = "libdc1394",
.long_name = NULL_IF_CONFIG_SMALL("dc1394 v.1 A/V grab"),
.priv_data_size = sizeof(struct dc1394_data),