From c6610a216ed2948885772154a2eed696e0cb4aca Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Tue, 25 Jan 2011 22:03:28 +0000 Subject: 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. --- libavformat/img2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavformat/img2.c') diff --git a/libavformat/img2.c b/libavformat/img2.c index 71f1dd0a1b..4cf409e001 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -412,7 +412,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) /* input */ #if CONFIG_IMAGE2_DEMUXER -AVInputFormat image2_demuxer = { +AVInputFormat ff_image2_demuxer = { .name = "image2", .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), .priv_data_size = sizeof(VideoData), @@ -423,7 +423,7 @@ AVInputFormat image2_demuxer = { }; #endif #if CONFIG_IMAGE2PIPE_DEMUXER -AVInputFormat image2pipe_demuxer = { +AVInputFormat ff_image2pipe_demuxer = { .name = "image2pipe", .long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"), .priv_data_size = sizeof(VideoData), @@ -434,7 +434,7 @@ AVInputFormat image2pipe_demuxer = { /* output */ #if CONFIG_IMAGE2_MUXER -AVOutputFormat image2_muxer = { +AVOutputFormat ff_image2_muxer = { .name = "image2", .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), .extensions = "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png," @@ -447,7 +447,7 @@ AVOutputFormat image2_muxer = { }; #endif #if CONFIG_IMAGE2PIPE_MUXER -AVOutputFormat image2pipe_muxer = { +AVOutputFormat ff_image2pipe_muxer = { .name = "image2pipe", .long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"), .priv_data_size = sizeof(VideoData), -- cgit v1.2.3