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

Fixes ticket #6779.

Carl Eugen Hoyos committed 9 years ago

Commit 85182941 parent 7f9de7b1 file · +2 −2Browse files

Unified · Split

libswresample/swresample.c+2−2

@@ -240,7 +240,7 @@ av_cold int swr_init(struct SwrContext *s){ · 239 unmodified lines
240	&&s->int_sample_fmt != AV_SAMPLE_FMT_S64P	240	&&s->int_sample_fmt != AV_SAMPLE_FMT_S64P
241	&&s->int_sample_fmt != AV_SAMPLE_FMT_FLTP	241	&&s->int_sample_fmt != AV_SAMPLE_FMT_FLTP
242	&&s->int_sample_fmt != AV_SAMPLE_FMT_DBLP){	242	&&s->int_sample_fmt != AV_SAMPLE_FMT_DBLP){
243	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));	243	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));
244	return AVERROR(EINVAL);	244	return AVERROR(EINVAL);
245	}	245	}
246		246
@@ -276,7 +276,7 @@ av_cold int swr_init(struct SwrContext *s){ · 29 unmodified lines
276	&& s->int_sample_fmt != AV_SAMPLE_FMT_FLTP	276	&& s->int_sample_fmt != AV_SAMPLE_FMT_FLTP
277	&& s->int_sample_fmt != AV_SAMPLE_FMT_DBLP	277	&& s->int_sample_fmt != AV_SAMPLE_FMT_DBLP
278	&& s->resample){	278	&& s->resample){
279	av_log(s, AV_LOG_ERROR, "Resampling only supported with internal s16/s32/flt/dbl\n");	279	av_log(s, AV_LOG_ERROR, "Resampling only supported with internal s16p/s32p/fltp/dblp\n");
280	ret = AVERROR(EINVAL);	280	ret = AVERROR(EINVAL);
281	goto fail;	281	goto fail;
282	}	282	}