From: Reimar Döffinger Date: Wed, 22 Jun 2011 16:25:49 +0000 (+0200) Subject: Revert needless API change in 05e84c95. X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c956907eca740f609a4e19d32b43a01fbaedff75;p=ffmpeg Revert needless API change in 05e84c95. When providing a custom AVIOContex for a AVFMT_NOFILE format only print a warning instead of erroring out. This allows the code to work with older MPlayer versions that just always set pb out of laziness. Signed-off-by: Reimar Döffinger --- diff --git a/libavformat/utils.c b/libavformat/utils.c index cd90480be64..e0a5455d758 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -591,7 +591,8 @@ static int init_input(AVFormatContext *s, const char *filename) if (!s->iformat) return av_probe_input_buffer(s->pb, &s->iformat, filename, s, 0, 0); else if (s->iformat->flags & AVFMT_NOFILE) - return AVERROR(EINVAL); + av_log(s, AV_LOG_WARNING, "Custom AVIOContext makes no sense and " + "will be ignored with AVFMT_NOFILE format.\n"); return 0; }