diff options
author | Alex Converse <alex.converse@gmail.com> | 2011-11-22 10:38:37 -0800 |
---|---|---|
committer | Alex Converse <alex.converse@gmail.com> | 2011-11-22 14:33:11 -0800 |
commit | 105ab61c5f68d58731ccc592176aa9fc073b32b1 (patch) | |
tree | 87f2b6986387e2a1d3580c1a263dfda19cdf1f21 | |
parent | 0e8fdd41c268a68a64447de037be2a279ce4afe2 (diff) | |
download | ffmpeg-105ab61c5f68d58731ccc592176aa9fc073b32b1.tar.gz |
avconv: Consistently use PIX_FMT_NONE.
Use PIX_FMT_NONE instead of -1 when dealing with PixelFormat variables.
-rw-r--r-- | avconv.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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", |