generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc: use avpriv_ prefix for ff_toupper4.

Browse Source 
It's used in lavf.
This commit is contained in:
Anton Khirnov 2011-10-17 10:12:51 +02:00
parent 9f51c682ee
commit 0842d58998
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/internal.h
View File

@ -53,6 +53,6 @@ AVHWAccel *ff_find_hwaccel(enum CodecID codec_id, enum PixelFormat pix_fmt);
*/ */
int ff_match_2uint16(const uint16_t (*tab)[2], int size, int a, int b); int ff_match_2uint16(const uint16_t (*tab)[2], int size, int a, int b);
unsigned int ff_toupper4(unsigned int x); unsigned int avpriv_toupper4(unsigned int x);
#endif /* AVCODEC_INTERNAL_H */ #endif /* AVCODEC_INTERNAL_H */

4
libavcodec/mpegvideo.c
View File

@ -646,9 +646,9 @@ av_cold int MPV_common_init(MpegEncContext *s)
yc_size = y_size + 2 * c_size; yc_size = y_size + 2 * c_size;
/* convert fourcc to upper case */ /* convert fourcc to upper case */
s->codec_tag = ff_toupper4(s->avctx->codec_tag); s->codec_tag = avpriv_toupper4(s->avctx->codec_tag);
s->stream_codec_tag = ff_toupper4(s->avctx->stream_codec_tag); s->stream_codec_tag = avpriv_toupper4(s->avctx->stream_codec_tag);
s->avctx->coded_frame= (AVFrame*)&s->current_picture; s->avctx->coded_frame= (AVFrame*)&s->current_picture;

2
libavcodec/utils.c
View File

@ -1269,7 +1269,7 @@ int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op))
return 0; return 0;
} }
unsigned int ff_toupper4(unsigned int x) unsigned int avpriv_toupper4(unsigned int x)
{ {
return toupper( x &0xFF) return toupper( x &0xFF)
+ (toupper((x>>8 )&0xFF)<<8 ) + (toupper((x>>8 )&0xFF)<<8 )

4
libavformat/utils.c
View File

@ -2148,7 +2148,7 @@ enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag)
return tags[i].id; return tags[i].id;
} }
for(i=0; tags[i].id != CODEC_ID_NONE; i++) { 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 tags[i].id;
} }
return CODEC_ID_NONE; 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++) { for (n = 0; s->oformat->codec_tag[n]; n++) {
avctag = s->oformat->codec_tag[n]; avctag = s->oformat->codec_tag[n];
while (avctag->id != CODEC_ID_NONE) { 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; id = avctag->id;
if (id == st->codec->codec_id) if (id == st->codec->codec_id)
return 1; return 1;