[Ffmpeg-cvslog] r6129 - trunk/vhook/watermark.c

[gpoirier]

Author: gpoirier
Date: Wed Aug 30 16:11:27 2006
New Revision: 6129

Modified:
   trunk/vhook/watermark.c

Log:
Re-Add support for PNG or PNM as watermark images, which was broken 
since the move to image2 API
Patch by Victor Paesa <wzrlpy at arsystel.com>
Original thread:
Date: Aug 13, 2006 9:18 AM
Subject: [Ffmpeg-devel] [PATCH] Attempt image2 in watermark vhook


Modified: trunk/vhook/watermark.c
==============================================================================
--- trunk/vhook/watermark.c	(original)
+++ trunk/vhook/watermark.c	Wed Aug 30 16:11:27 2006
@@ -421,6 +421,10 @@
                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;
             }