Skip to content

F
ffmpeg.wasm-core
Commit 105ab61c authored by Alex Converse's avatar Alex Converse
Browse files
Options

avconv: Consistently use PIX_FMT_NONE. 

Use PIX_FMT_NONE instead of -1 when dealing with PixelFormat variables.
parent 0e8fdd41
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
avconv.c
View file @ 105ab61c
...@@ -673,11 +673,11 @@ static void choose_pixel_fmt(AVStream *st, AVCodec *codec) ...@@ -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}; 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) if(*p == st->codec->pix_fmt)
break; break;
} }
if (*p == -1) { if (*p == PIX_FMT_NONE) {
if(st->codec->pix_fmt != PIX_FMT_NONE) if(st->codec->pix_fmt != PIX_FMT_NONE)
av_log(NULL, AV_LOG_WARNING, av_log(NULL, AV_LOG_WARNING,
"Incompatible pixel format '%s' for codec '%s', auto-selecting format '%s'\n", "Incompatible pixel format '%s' for codec '%s', auto-selecting format '%s'\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment