[FFmpeg-cvslog] avconv: Consistently use PIX_FMT_NONE.

Alex Converse git at videolan.org
Wed Nov 23 04:14:18 CET 2011


ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Tue Nov 22 10:38:37 2011 -0800| [105ab61c5f68d58731ccc592176aa9fc073b32b1] | committer: Alex Converse

avconv: Consistently use PIX_FMT_NONE.

Use PIX_FMT_NONE instead of -1 when dealing with PixelFormat variables.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=105ab61c5f68d58731ccc592176aa9fc073b32b1
---

 avconv.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/avconv.c b/avconv.c
index a87f852..a03c9c1 100644
--- 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",



More information about the ffmpeg-cvslog mailing list