RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-30 03:12:08 +00:00
Code Issues Projects Releases Wiki Activity

avformat: Add prefix to get_codec_guid()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-27 19:25:27 +01:00
parent ae20682f6b
commit 0a23129bfc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/riff.h
View File

@ -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);

4
libavformat/riffenc.c
View File

@ -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++) {

4
libavformat/wtvenc.c
View File

@ -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;