avconv: Consistently use PIX_FMT_NONE.
authorAlex Converse <alex.converse@gmail.com>
Tue, 22 Nov 2011 18:38:37 +0000 (10:38 -0800)
committerAlex Converse <alex.converse@gmail.com>
Tue, 22 Nov 2011 22:33:11 +0000 (14:33 -0800)
Use PIX_FMT_NONE instead of -1 when dealing with PixelFormat variables.

avconv.c

index a87f852..a03c9c1 100644 (file)
--- a/avconv.c
+++ b/avconv.c
@@ -673,11 +673,11 @@ static void choose_pixel_fmt(AVStream *st, AVCodec *codec)
                 p= (const enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ444P, PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_BGRA, PIX_FMT_NONE};
             }
         }
-        for(; *p!=-1; p++){
+        for (; *p != PIX_FMT_NONE; p++) {
             if(*p == st->codec->pix_fmt)
                 break;
         }
-        if (*p == -1) {
+        if (*p == PIX_FMT_NONE) {
             if(st->codec->pix_fmt != PIX_FMT_NONE)
                 av_log(NULL, AV_LOG_WARNING,
                         "Incompatible pixel format '%s' for codec '%s', auto-selecting format '%s'\n",