From c6610a216ed2948885772154a2eed696e0cb4aca Mon Sep 17 00:00:00 2001
From: Diego Elio Pettenò <flameeyes@gmail.com>
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/rawenc.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'libavformat/rawenc.c')

diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index 5a116b189e..6f9fdce4a1 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -33,7 +33,7 @@ int ff_raw_write_packet(AVFormatContext *s, AVPacket *pkt)
 /* Note: Do not forget to add new entries to the Makefile as well. */
 
 #if CONFIG_AC3_MUXER
-AVOutputFormat ac3_muxer = {
+AVOutputFormat ff_ac3_muxer = {
     "ac3",
     NULL_IF_CONFIG_SMALL("raw AC-3"),
     "audio/x-ac3",
@@ -48,7 +48,7 @@ AVOutputFormat ac3_muxer = {
 #endif
 
 #if CONFIG_DIRAC_MUXER
-AVOutputFormat dirac_muxer = {
+AVOutputFormat ff_dirac_muxer = {
     "dirac",
     NULL_IF_CONFIG_SMALL("raw Dirac"),
     NULL,
@@ -63,7 +63,7 @@ AVOutputFormat dirac_muxer = {
 #endif
 
 #if CONFIG_DNXHD_MUXER
-AVOutputFormat dnxhd_muxer = {
+AVOutputFormat ff_dnxhd_muxer = {
     "dnxhd",
     NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
     NULL,
@@ -78,7 +78,7 @@ AVOutputFormat dnxhd_muxer = {
 #endif
 
 #if CONFIG_DTS_MUXER
-AVOutputFormat dts_muxer = {
+AVOutputFormat ff_dts_muxer = {
     "dts",
     NULL_IF_CONFIG_SMALL("raw DTS"),
     "audio/x-dca",
@@ -93,7 +93,7 @@ AVOutputFormat dts_muxer = {
 #endif
 
 #if CONFIG_EAC3_MUXER
-AVOutputFormat eac3_muxer = {
+AVOutputFormat ff_eac3_muxer = {
     "eac3",
     NULL_IF_CONFIG_SMALL("raw E-AC-3"),
     "audio/x-eac3",
@@ -108,7 +108,7 @@ AVOutputFormat eac3_muxer = {
 #endif
 
 #if CONFIG_G722_MUXER
-AVOutputFormat g722_muxer = {
+AVOutputFormat ff_g722_muxer = {
     "g722",
     NULL_IF_CONFIG_SMALL("raw G.722"),
     "audio/G722",
@@ -123,7 +123,7 @@ AVOutputFormat g722_muxer = {
 #endif
 
 #if CONFIG_H261_MUXER
-AVOutputFormat h261_muxer = {
+AVOutputFormat ff_h261_muxer = {
     "h261",
     NULL_IF_CONFIG_SMALL("raw H.261"),
     "video/x-h261",
@@ -138,7 +138,7 @@ AVOutputFormat h261_muxer = {
 #endif
 
 #if CONFIG_H263_MUXER
-AVOutputFormat h263_muxer = {
+AVOutputFormat ff_h263_muxer = {
     "h263",
     NULL_IF_CONFIG_SMALL("raw H.263"),
     "video/x-h263",
@@ -153,7 +153,7 @@ AVOutputFormat h263_muxer = {
 #endif
 
 #if CONFIG_H264_MUXER
-AVOutputFormat h264_muxer = {
+AVOutputFormat ff_h264_muxer = {
     "h264",
     NULL_IF_CONFIG_SMALL("raw H.264 video format"),
     NULL,
@@ -168,7 +168,7 @@ AVOutputFormat h264_muxer = {
 #endif
 
 #if CONFIG_CAVSVIDEO_MUXER
-AVOutputFormat cavsvideo_muxer = {
+AVOutputFormat ff_cavsvideo_muxer = {
     "cavsvideo",
     NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),
     NULL,
@@ -183,7 +183,7 @@ AVOutputFormat cavsvideo_muxer = {
 #endif
 
 #if CONFIG_M4V_MUXER
-AVOutputFormat m4v_muxer = {
+AVOutputFormat ff_m4v_muxer = {
     "m4v",
     NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
     NULL,
@@ -198,7 +198,7 @@ AVOutputFormat m4v_muxer = {
 #endif
 
 #if CONFIG_MJPEG_MUXER
-AVOutputFormat mjpeg_muxer = {
+AVOutputFormat ff_mjpeg_muxer = {
     "mjpeg",
     NULL_IF_CONFIG_SMALL("raw MJPEG video"),
     "video/x-mjpeg",
@@ -213,7 +213,7 @@ AVOutputFormat mjpeg_muxer = {
 #endif
 
 #if CONFIG_MLP_MUXER
-AVOutputFormat mlp_muxer = {
+AVOutputFormat ff_mlp_muxer = {
     "mlp",
     NULL_IF_CONFIG_SMALL("raw MLP"),
     NULL,
@@ -228,7 +228,7 @@ AVOutputFormat mlp_muxer = {
 #endif
 
 #if CONFIG_SRT_MUXER
-AVOutputFormat srt_muxer = {
+AVOutputFormat ff_srt_muxer = {
     .name           = "srt",
     .long_name      = NULL_IF_CONFIG_SMALL("SubRip subtitle format"),
     .mime_type      = "application/x-subrip",
@@ -240,7 +240,7 @@ AVOutputFormat srt_muxer = {
 #endif
 
 #if CONFIG_TRUEHD_MUXER
-AVOutputFormat truehd_muxer = {
+AVOutputFormat ff_truehd_muxer = {
     "truehd",
     NULL_IF_CONFIG_SMALL("raw TrueHD"),
     NULL,
@@ -255,7 +255,7 @@ AVOutputFormat truehd_muxer = {
 #endif
 
 #if CONFIG_MPEG1VIDEO_MUXER
-AVOutputFormat mpeg1video_muxer = {
+AVOutputFormat ff_mpeg1video_muxer = {
     "mpeg1video",
     NULL_IF_CONFIG_SMALL("raw MPEG-1 video"),
     "video/x-mpeg",
@@ -270,7 +270,7 @@ AVOutputFormat mpeg1video_muxer = {
 #endif
 
 #if CONFIG_MPEG2VIDEO_MUXER
-AVOutputFormat mpeg2video_muxer = {
+AVOutputFormat ff_mpeg2video_muxer = {
     "mpeg2video",
     NULL_IF_CONFIG_SMALL("raw MPEG-2 video"),
     NULL,
@@ -285,7 +285,7 @@ AVOutputFormat mpeg2video_muxer = {
 #endif
 
 #if CONFIG_RAWVIDEO_MUXER
-AVOutputFormat rawvideo_muxer = {
+AVOutputFormat ff_rawvideo_muxer = {
     "rawvideo",
     NULL_IF_CONFIG_SMALL("raw video format"),
     NULL,
-- 
cgit v1.2.3