ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Feb 27 19:25:27 2015 +0100| [0a23129bfc6f14c30c25aafcbf45c4b1b0f728ee] | committer: Michael Niedermayer
avformat: Add prefix to get_codec_guid() Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a23129bfc6f14c30c25aafcbf45c4b1b0f728ee --- libavformat/riff.h | 2 +- libavformat/riffenc.c | 4 ++-- libavformat/wtvenc.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/riff.h b/libavformat/riff.h index 15b07a6..ae5ecef 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -110,7 +110,7 @@ static av_always_inline int ff_guidcmp(const void *g1, const void *g2) int ff_get_guid(AVIOContext *s, ff_asf_guid *g); void ff_put_guid(AVIOContext *s, const ff_asf_guid *g); -const ff_asf_guid *get_codec_guid(enum AVCodecID id, const AVCodecGuid *av_guid); +const ff_asf_guid *ff_get_codec_guid(enum AVCodecID id, const AVCodecGuid *av_guid); enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid); diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c index 5e85800..a629b8a 100644 --- a/libavformat/riffenc.c +++ b/libavformat/riffenc.c @@ -178,7 +178,7 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc, int flags) avio_wl32(pb, write_channel_mask ? enc->channel_layout : 0); /* GUID + next 3 */ if (enc->codec_id == AV_CODEC_ID_EAC3) { - ff_put_guid(pb, get_codec_guid(enc->codec_id, ff_codec_wav_guids)); + ff_put_guid(pb, ff_get_codec_guid(enc->codec_id, ff_codec_wav_guids)); } else { avio_wl32(pb, enc->codec_tag); avio_wl32(pb, 0x00100000); @@ -326,7 +326,7 @@ void ff_put_guid(AVIOContext *s, const ff_asf_guid *g) avio_write(s, *g, sizeof(*g)); } -const ff_asf_guid *get_codec_guid(enum AVCodecID id, const AVCodecGuid *av_guid) +const ff_asf_guid *ff_get_codec_guid(enum AVCodecID id, const AVCodecGuid *av_guid) { int i; for (i = 0; av_guid[i].id != AV_CODEC_ID_NONE; i++) { diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c index 634545d..e8a2b72 100644 --- a/libavformat/wtvenc.c +++ b/libavformat/wtvenc.c @@ -265,12 +265,12 @@ static int write_stream_codec_info(AVFormatContext *s, AVStream *st) int hdr_size = 0; if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { - g = get_codec_guid(st->codec->codec_id, ff_video_guids); + g = ff_get_codec_guid(st->codec->codec_id, ff_video_guids); media_type = &ff_mediatype_video; format_type = st->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO ? &ff_format_mpeg2_video : &ff_format_videoinfo2; tags = ff_codec_bmp_tags; } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { - g = get_codec_guid(st->codec->codec_id, ff_codec_wav_guids); + g = ff_get_codec_guid(st->codec->codec_id, ff_codec_wav_guids); media_type = &ff_mediatype_audio; format_type = &ff_format_waveformatex; tags = ff_codec_wav_tags; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
