diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-10-17 10:12:51 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-10-20 21:06:58 +0200 |
| commit | 0842d58998f441768b5e4376aa0c1d7be0e07a8b (patch) | |
| tree | 7a026d410b1cf8642f9814260e80b9c9d2a7a9a2 /libavformat | |
| parent | 9f51c682ee83ecf0995648d4574ac09b52bbcb24 (diff) | |
| download | ffmpeg-0842d58998f441768b5e4376aa0c1d7be0e07a8b.tar.gz | |
lavc: use avpriv_ prefix for ff_toupper4.
It's used in lavf.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 1c1a7482e5..d0a7fb90be 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2148,7 +2148,7 @@ enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag) return tags[i].id; } for(i=0; tags[i].id != CODEC_ID_NONE; i++) { - if (ff_toupper4(tag) == ff_toupper4(tags[i].tag)) + if (avpriv_toupper4(tag) == avpriv_toupper4(tags[i].tag)) return tags[i].id; } return CODEC_ID_NONE; @@ -2807,7 +2807,7 @@ static int validate_codec_tag(AVFormatContext *s, AVStream *st) for (n = 0; s->oformat->codec_tag[n]; n++) { avctag = s->oformat->codec_tag[n]; while (avctag->id != CODEC_ID_NONE) { - if (ff_toupper4(avctag->tag) == ff_toupper4(st->codec->codec_tag)) { + if (avpriv_toupper4(avctag->tag) == avpriv_toupper4(st->codec->codec_tag)) { id = avctag->id; if (id == st->codec->codec_id) return 1; |