[FFmpeg-devel] [PATCH 1/3] Correctly prefix with "ff_" codec_movvideo_tags and codec_movaudio_tags, as they are internally shared symbols.
Stefano Sabatini
stefano.sabatini-lala
Sat Jun 12 02:02:20 CEST 2010
---
libavformat/isom.c | 4 ++--
libavformat/isom.h | 4 ++--
libavformat/matroskadec.c | 2 +-
libavformat/matroskaenc.c | 4 ++--
libavformat/mov.c | 6 +++---
libavformat/movenc.c | 6 +++---
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/libavformat/isom.c b/libavformat/isom.c
index fd0d456..5039b9e 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -58,7 +58,7 @@ const AVCodecTag ff_mp4_obj_type[] = {
{ CODEC_ID_NONE , 0 },
};
-const AVCodecTag codec_movvideo_tags[] = {
+const AVCodecTag ff_codec_movvideo_tags[] = {
/* { CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */
{ CODEC_ID_RAWVIDEO, MKTAG('r', 'a', 'w', ' ') }, /* Uncompressed RGB */
@@ -187,7 +187,7 @@ const AVCodecTag codec_movvideo_tags[] = {
{ CODEC_ID_NONE, 0 },
};
-const AVCodecTag codec_movaudio_tags[] = {
+const AVCodecTag ff_codec_movaudio_tags[] = {
{ CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2') },
{ CODEC_ID_PCM_S32LE, MKTAG('i', 'n', '3', '2') },
{ CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') },
diff --git a/libavformat/isom.h b/libavformat/isom.h
index ccfbd16..7ccbd77 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -30,8 +30,8 @@
/* isom.c */
extern const AVCodecTag ff_mp4_obj_type[];
-extern const AVCodecTag codec_movvideo_tags[];
-extern const AVCodecTag codec_movaudio_tags[];
+extern const AVCodecTag ff_codec_movvideo_tags[];
+extern const AVCodecTag ff_codec_movaudio_tags[];
extern const AVCodecTag ff_codec_movsubtitle_tags[];
int ff_mov_iso639_to_lang(const char lang[4], int mp4);
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 7995ce5..b9f0c2d 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1297,7 +1297,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
&& (track->codec_priv.size >= 86)
&& (track->codec_priv.data != NULL)) {
track->video.fourcc = AV_RL32(track->codec_priv.data);
- codec_id=ff_codec_get_id(codec_movvideo_tags, track->video.fourcc);
+ codec_id=ff_codec_get_id(ff_codec_movvideo_tags, track->video.fourcc);
} else if (codec_id == CODEC_ID_PCM_S16BE) {
switch (track->audio.bitdepth) {
case 8: codec_id = CODEC_ID_PCM_U8; break;
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 2238c13..af5a991 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -482,7 +482,7 @@ static int mkv_write_codecprivate(AVFormatContext *s, ByteIOContext *pb, AVCodec
} else if (codec->codec_type == AVMEDIA_TYPE_VIDEO) {
if (qt_id) {
if (!codec->codec_tag)
- codec->codec_tag = ff_codec_get_tag(codec_movvideo_tags, codec->codec_id);
+ codec->codec_tag = ff_codec_get_tag(ff_codec_movvideo_tags, codec->codec_id);
if (codec->extradata_size)
put_buffer(dyn_cp, codec->extradata, codec->extradata_size);
} else {
@@ -580,7 +580,7 @@ static int mkv_write_tracks(AVFormatContext *s)
put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, av_q2d(codec->time_base)*1E9);
if (!native_id &&
- ff_codec_get_tag(codec_movvideo_tags, codec->codec_id) &&
+ ff_codec_get_tag(ff_codec_movvideo_tags, codec->codec_id) &&
(!ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id)
|| codec->codec_id == CODEC_ID_SVQ1
|| codec->codec_id == CODEC_ID_SVQ3
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2edd27e..b7f2455 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -973,7 +973,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
if (st->codec->codec_tag &&
st->codec->codec_tag != format &&
- (c->fc->video_codec_id ? ff_codec_get_id(codec_movvideo_tags, format) != c->fc->video_codec_id
+ (c->fc->video_codec_id ? ff_codec_get_id(ff_codec_movvideo_tags, format) != c->fc->video_codec_id
: st->codec->codec_tag != MKTAG('j','p','e','g'))
){
/* Multiple fourcc, we skip JPEG. This is not correct, we should
@@ -987,7 +987,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
sc->dref_id= dref_id;
st->codec->codec_tag = format;
- id = ff_codec_get_id(codec_movaudio_tags, format);
+ id = ff_codec_get_id(ff_codec_movaudio_tags, format);
if (id<=0 && ((format&0xFFFF) == 'm'+('s'<<8) || (format&0xFFFF) == 'T'+('S'<<8)))
id = ff_codec_get_id(ff_codec_wav_tags, bswap_32(format)&0xFFFF);
@@ -995,7 +995,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
} else if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO && /* do not overwrite codec type */
format && format != MKTAG('m','p','4','s')) { /* skip old asf mpeg4 tag */
- id = ff_codec_get_id(codec_movvideo_tags, format);
+ id = ff_codec_get_id(ff_codec_movvideo_tags, format);
if (id <= 0)
id = ff_codec_get_id(ff_codec_bmp_tags, format);
if (id > 0)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 3495eb0..0360cf9 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -663,7 +663,7 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track)
else if (track->enc->codec_id == CODEC_ID_RAWVIDEO)
tag = mov_get_rawvideo_codec_tag(s, track);
else if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) {
- tag = ff_codec_get_tag(codec_movvideo_tags, track->enc->codec_id);
+ tag = ff_codec_get_tag(ff_codec_movvideo_tags, track->enc->codec_id);
if (!tag) { // if no mac fcc found, try with Microsoft tags
tag = ff_codec_get_tag(ff_codec_bmp_tags, track->enc->codec_id);
if (tag)
@@ -671,7 +671,7 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track)
"the file may be unplayable!\n");
}
} else if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
- tag = ff_codec_get_tag(codec_movaudio_tags, track->enc->codec_id);
+ tag = ff_codec_get_tag(ff_codec_movaudio_tags, track->enc->codec_id);
if (!tag) { // if no mac fcc found, try with Microsoft tags
int ms_tag = ff_codec_get_tag(ff_codec_wav_tags, track->enc->codec_id);
if (ms_tag) {
@@ -2194,7 +2194,7 @@ AVOutputFormat mov_muxer = {
ff_mov_write_packet,
mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
- .codec_tag = (const AVCodecTag* const []){codec_movvideo_tags, codec_movaudio_tags, 0},
+ .codec_tag = (const AVCodecTag* const []){ff_codec_movvideo_tags, ff_codec_movaudio_tags, 0},
};
#endif
#if CONFIG_TGP_MUXER
--
1.7.1
More information about the ffmpeg-devel
mailing list