Browse Source

swr: fix invalid sample format message.

If the sample format is invalid, av_get_sample_fmt_name() will always
return NULL.
tags/n0.9
Clément Bœsch 14 years ago
parent
commit
0232f788b6
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libswresample/swresample.c

+ 2
- 2
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);

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);
}
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);
}



Loading…
Cancel
Save