[Ffmpeg-cvslog] CVS: ffmpeg/libavformat avienc.c,1.123,1.124
Alex Beregszaszi
alex
Tue Feb 21 21:32:50 CET 2006
Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv5924
Modified Files:
avienc.c
Log Message:
check for CODEC_ID_NONE instead 0, tobe compatible with movenc.c and possible CODEC_ID_NONE value change
Index: avienc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avienc.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- avienc.c 19 Feb 2006 10:20:27 -0000 1.123
+++ avienc.c 21 Feb 2006 20:32:47 -0000 1.124
@@ -199,12 +199,12 @@
{ 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 @@
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 @@
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)
More information about the ffmpeg-cvslog
mailing list