diff options
| author | Daniel Verkamp <daniel@drv.nu> | 2009-06-22 23:09:34 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-06-22 23:09:34 +0000 |
| commit | 1a40491ef212869077278b46f74ee92a66809d20 (patch) | |
| tree | 73badafecd3120080515ba6391fe8fe39b1435a6 /libavformat/oggparseogm.c | |
| parent | 2795e3573d9407aca8060bdebaeb2119d19587c8 (diff) | |
Add ff_ prefixes to exported symbols in libavformat/riff.h.
patch by Daniel Verkamp, aniel drv nu
Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/oggparseogm.c')
| -rw-r--r-- | libavformat/oggparseogm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c index 6a0a4c119a..f13f8c5242 100644 --- a/libavformat/oggparseogm.c +++ b/libavformat/oggparseogm.c @@ -53,7 +53,7 @@ ogm_header(AVFormatContext *s, int idx) st->codec->codec_type = CODEC_TYPE_VIDEO; p += 8; tag = bytestream_get_le32(&p); - st->codec->codec_id = codec_get_id(codec_bmp_tags, tag); + st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag); st->codec->codec_tag = tag; } else if (*p == 't') { st->codec->codec_type = CODEC_TYPE_SUBTITLE; @@ -67,7 +67,7 @@ ogm_header(AVFormatContext *s, int idx) bytestream_get_buffer(&p, acid, 4); acid[4] = 0; cid = strtol(acid, NULL, 16); - st->codec->codec_id = codec_get_id(codec_wav_tags, cid); + st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, cid); st->need_parsing = AVSTREAM_PARSE_FULL; } @@ -115,14 +115,14 @@ ogm_dshow_header(AVFormatContext *s, int idx) if(t == 0x05589f80){ st->codec->codec_type = CODEC_TYPE_VIDEO; - st->codec->codec_id = codec_get_id(codec_bmp_tags, AV_RL32(p + 68)); + st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(p + 68)); st->codec->time_base.den = 10000000; st->codec->time_base.num = AV_RL64(p + 164); st->codec->width = AV_RL32(p + 176); st->codec->height = AV_RL32(p + 180); } else if(t == 0x05589f81){ st->codec->codec_type = CODEC_TYPE_AUDIO; - st->codec->codec_id = codec_get_id(codec_wav_tags, AV_RL16(p + 124)); + st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, AV_RL16(p + 124)); st->codec->channels = AV_RL16(p + 126); st->codec->sample_rate = AV_RL32(p + 128); st->codec->bit_rate = AV_RL32(p + 132) * 8; |