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/avidec.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/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 10f9417d2d..b3c4177d01 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -504,7 +504,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) #endif st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_tag = tag1; - st->codec->codec_id = codec_get_id(codec_bmp_tags, tag1); + st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1); st->need_parsing = AVSTREAM_PARSE_HEADERS; // This is needed to get the pict type which is necessary for generating correct pts. if(st->codec->codec_tag==0 && st->codec->height > 0 && st->codec->extradata_size < 1U<<30){ @@ -518,7 +518,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) // url_fskip(pb, size - 5 * 4); break; case CODEC_TYPE_AUDIO: - get_wav_header(pb, st->codec, size); + ff_get_wav_header(pb, st->codec, size); if(ast->sample_size && st->codec->block_align && ast->sample_size != st->codec->block_align){ av_log(s, AV_LOG_WARNING, "sample size (%d) != block align (%d)\n", ast->sample_size, st->codec->block_align); ast->sample_size= st->codec->block_align; |