diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2006-02-21 20:32:47 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2006-02-21 20:32:47 +0000 |
| commit | fb7a2bf6956173eda6f9caceef8599fa4f83500d (patch) | |
| tree | afc6421875557323da6d15fc25f78ce21358c0f3 /libavformat/avienc.c | |
| parent | a1db1fc445183d949b0f171c293385f2bd1d9038 (diff) | |
check for CODEC_ID_NONE instead 0, tobe compatible with movenc.c and possible CODEC_ID_NONE value change
Originally committed as revision 5043 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avienc.c')
| -rw-r--r-- | libavformat/avienc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 3900799ad0..84de17c791 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -199,12 +199,12 @@ const CodecTag codec_bmp_tags[] = { { CODEC_ID_CSCD, MKTAG('C', 'S', 'C', 'D') }, { CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') }, { CODEC_ID_RAWVIDEO, 0 }, - { 0, 0 }, + { CODEC_ID_NONE, 0 }, }; unsigned int codec_get_tag(const CodecTag *tags, int id) { - while (tags->id != 0) { + while (tags->id != CODEC_ID_NONE) { if (tags->id == id) return tags->tag; tags++; @@ -214,7 +214,7 @@ unsigned int codec_get_tag(const CodecTag *tags, int id) static unsigned int codec_get_asf_tag(const CodecTag *tags, unsigned int id) { - while (tags->id != 0) { + while (tags->id != CODEC_ID_NONE) { if (!tags->invalid_asf && tags->id == id) return tags->tag; tags++; @@ -224,7 +224,7 @@ static unsigned int codec_get_asf_tag(const CodecTag *tags, unsigned int id) enum CodecID codec_get_id(const CodecTag *tags, unsigned int tag) { - while (tags->id != 0) { + while (tags->id != CODEC_ID_NONE) { if( toupper((tag >> 0)&0xFF) == toupper((tags->tag >> 0)&0xFF) && toupper((tag >> 8)&0xFF) == toupper((tags->tag >> 8)&0xFF) && toupper((tag >>16)&0xFF) == toupper((tags->tag >>16)&0xFF) |