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:
73be29b
)
Make ffmpeg warns the user when the selected sample format is ignored.
author
Stefano Sabatini
<stefano.sabatini-lala@poste.it>
Fri, 14 Jan 2011 14:50:55 +0000
(15:50 +0100)
committer
Mans Rullgard
<mans@mansr.com>
Mon, 31 Jan 2011 12:55:38 +0000
(12:55 +0000)
Signed-off-by: Mans Rullgard <mans@mansr.com>
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
691b73e
..
df89018
100644
(file)
--- a/
ffmpeg.c
+++ b/
ffmpeg.c
@@
-600,8
+600,14
@@
static void choose_sample_fmt(AVStream *st, AVCodec *codec)
if(*p == st->codec->sample_fmt)
break;
}
- if(*p == -1)
+ if (*p == -1) {
+ av_log(NULL, AV_LOG_WARNING,
+ "Incompatible sample format '%s' for codec '%s', auto-selecting format '%s'\n",
+ av_get_sample_fmt_name(st->codec->sample_fmt),
+ codec->name,
+ av_get_sample_fmt_name(codec->sample_fmts[0]));
st->codec->sample_fmt = codec->sample_fmts[0];
+ }
}
}