Browse Source

Print the whitelists if entities are not found on them

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.0
Michael Niedermayer 10 years ago
parent
commit
a7305c780b
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      libavcodec/utils.c
  2. +2
    -2
      libavformat/utils.c

+ 1
- 1
libavcodec/utils.c View File

@@ -1234,7 +1234,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
goto free_and_end;

if (avctx->codec_whitelist && av_match_list(codec->name, avctx->codec_whitelist, ',') <= 0) {
av_log(avctx, AV_LOG_ERROR, "Codec (%s) not on whitelist\n", codec->name);
av_log(avctx, AV_LOG_ERROR, "Codec (%s) not on whitelist \'%s\'\n", codec->name, avctx->codec_whitelist);
ret = AVERROR(EINVAL);
goto free_and_end;
}


+ 2
- 2
libavformat/utils.c View File

@@ -313,7 +313,7 @@ int av_demuxer_open(AVFormatContext *ic) {
int err;

if (ic->format_whitelist && av_match_list(ic->iformat->name, ic->format_whitelist, ',') <= 0) {
av_log(ic, AV_LOG_ERROR, "Format not on whitelist\n");
av_log(ic, AV_LOG_ERROR, "Format not on whitelist \'%s\'\n", ic->format_whitelist);
return AVERROR(EINVAL);
}

@@ -442,7 +442,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename,
s->probe_score = ret;

if (s->format_whitelist && av_match_list(s->iformat->name, s->format_whitelist, ',') <= 0) {
av_log(s, AV_LOG_ERROR, "Format not on whitelist\n");
av_log(s, AV_LOG_ERROR, "Format not on whitelist \'%s\'\n", s->format_whitelist);
ret = AVERROR(EINVAL);
goto fail;
}


Loading…
Cancel
Save