RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

swr: fix invalid sample format message. 

If the sample format is invalid, av_get_sample_fmt_name() will always
return NULL.
This commit is contained in:
Clément Bœsch 2011-11-24 16:05:14 +01:00
parent 58205edcc6
commit 0232f788b6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libswresample/swresample.c
View File

@ -149,11 +149,11 @@ int swr_init(struct SwrContext *s){
s->out_sample_fmt= av_get_alt_sample_fmt(s->out_sample_fmt, 0); s->out_sample_fmt= av_get_alt_sample_fmt(s->out_sample_fmt, 0);
if(s-> in_sample_fmt >= AV_SAMPLE_FMT_NB){ if(s-> in_sample_fmt >= AV_SAMPLE_FMT_NB){
av_log(s, AV_LOG_ERROR, "Requested sample format %s is invalid\n", av_get_sample_fmt_name(s->in_sample_fmt)); av_log(s, AV_LOG_ERROR, "Requested input sample format %d is invalid\n", s->in_sample_fmt);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if(s->out_sample_fmt >= AV_SAMPLE_FMT_NB){ if(s->out_sample_fmt >= AV_SAMPLE_FMT_NB){
av_log(s, AV_LOG_ERROR, "Requested sample format %s is invalid\n", av_get_sample_fmt_name(s->out_sample_fmt)); av_log(s, AV_LOG_ERROR, "Requested output sample format %d is invalid\n", s->out_sample_fmt);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }