[FFmpeg-cvslog] lswr/swresample: Mention the actually supported formats when erroring out.

Carl Eugen Hoyos git at videolan.org
Sat Oct 28 16:12:01 EEST 2017


ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com> | Thu Oct 26 16:52:22 2017 +0200| [851829455889cfefee8d802d8428ed36effb9fcf] | committer: Carl Eugen Hoyos

lswr/swresample: Mention the actually supported formats when erroring out.

Fixes ticket #6779.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=851829455889cfefee8d802d8428ed36effb9fcf
---

 libswresample/swresample.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 74c96dce60..f076b6c8cf 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -240,7 +240,7 @@ av_cold int swr_init(struct SwrContext *s){
         &&s->int_sample_fmt != AV_SAMPLE_FMT_S64P
         &&s->int_sample_fmt != AV_SAMPLE_FMT_FLTP
         &&s->int_sample_fmt != AV_SAMPLE_FMT_DBLP){
-        av_log(s, AV_LOG_ERROR, "Requested sample format %s is not supported internally, S16/S32/S64/FLT/DBL is supported\n", av_get_sample_fmt_name(s->int_sample_fmt));
+        av_log(s, AV_LOG_ERROR, "Requested sample format %s is not supported internally, s16p/s32p/s64p/fltp/dblp are supported\n", av_get_sample_fmt_name(s->int_sample_fmt));
         return AVERROR(EINVAL);
     }
 
@@ -276,7 +276,7 @@ av_cold int swr_init(struct SwrContext *s){
         && s->int_sample_fmt != AV_SAMPLE_FMT_FLTP
         && s->int_sample_fmt != AV_SAMPLE_FMT_DBLP
         && s->resample){
-        av_log(s, AV_LOG_ERROR, "Resampling only supported with internal s16/s32/flt/dbl\n");
+        av_log(s, AV_LOG_ERROR, "Resampling only supported with internal s16p/s32p/fltp/dblp\n");
         ret = AVERROR(EINVAL);
         goto fail;
     }



More information about the ffmpeg-cvslog mailing list