summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2011-01-14 15:50:55 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-01-31 18:25:46 +0100
commit5a8d1075ec4243cca690ac6650cce4df88ec0ad5 (patch)
treef610b9098c2bd9a84be04edbcea840c91a5b036f /ffmpeg.c
parenta4257d74e09729c3f8ecc2065ed35b003ffbbfc6 (diff)
Make ffmpeg warns the user when the selected sample format is ignored.
Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit fa34a3626cf1aa19acbe9f8c6fcddb6c3eb8eaa1)
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 691b73e159..df890185aa 100644
--- 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];
+ }
}
}