From dd93315340cb597bf0c84f20e03803f042396c8b Mon Sep 17 00:00:00 2001 From: Víctor Paesa Date: Wed, 30 Aug 2006 14:11:27 +0000 Subject: Re-Add support for PNG or PNM as watermark images, which was broken since the move to image2 API Patch by Victor Paesa Original thread: Date: Aug 13, 2006 9:18 AM Subject: [Ffmpeg-devel] [PATCH] Attempt image2 in watermark vhook Originally committed as revision 6129 to svn://svn.ffmpeg.org/ffmpeg/trunk --- vhook/watermark.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'vhook/watermark.c') diff --git a/vhook/watermark.c b/vhook/watermark.c index c64e93ae91..692b2a52ce 100644 --- a/vhook/watermark.c +++ b/vhook/watermark.c @@ -420,6 +420,10 @@ int get_watermark_picture(ContextInfo *ci, int cleanup) } ci->p_ext = &(ci->filename[ci->i]); ci->file_iformat = av_find_input_format (ci->p_ext); + if (0 == ci->file_iformat) { + av_log(NULL, AV_LOG_INFO, "get_watermark_picture() attempt to use image2 for [%s]\n", ci->p_ext); + ci->file_iformat = av_find_input_format ("image2"); + } if (0 == ci->file_iformat) { av_log(NULL, AV_LOG_ERROR, "get_watermark_picture() Really failed to find iformat [%s]\n", ci->p_ext); return -1; -- cgit v1.2.3