projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
91199cf
)
ffmpeg: warns the user when the selected pixel format is ignored
author
Stefano Sabatini
<stefano.sabatini-lala@poste.it>
Sat, 26 Mar 2011 14:26:45 +0000
(15:26 +0100)
committer
Anton Khirnov
<anton@khirnov.net>
Wed, 11 May 2011 05:32:36 +0000
(07:32 +0200)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
74cfd09
..
612a413
100644
(file)
--- a/
ffmpeg.c
+++ b/
ffmpeg.c
@@
-590,8
+590,15
@@
static void choose_pixel_fmt(AVStream *st, AVCodec *codec)
if(*p == st->codec->pix_fmt)
break;
}
- if(*p == -1)
+ if (*p == -1) {
+ 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",
+ av_pix_fmt_descriptors[st->codec->pix_fmt].name,
+ codec->name,
+ av_pix_fmt_descriptors[codec->pix_fmts[0]].name);
st->codec->pix_fmt = codec->pix_fmts[0];
+ }
}
}