[FFmpeg-cvslog] Revert needless API change in 05e84c95.
Reimar Döffinger
git at videolan.org
Wed Jun 22 21:22:42 CEST 2011
ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Wed Jun 22 18:25:49 2011 +0200| [c956907eca740f609a4e19d32b43a01fbaedff75] | committer: Reimar Döffinger
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 <Reimar.Doeffinger at gmx.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c956907eca740f609a4e19d32b43a01fbaedff75
---
libavformat/utils.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index cd90480..e0a5455 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;
}
More information about the ffmpeg-cvslog
mailing list