diff options
| author | Víctor Paesa <wzrlpy@arsystel.com> | 2006-08-30 14:11:27 +0000 |
|---|---|---|
| committer | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2006-08-30 14:11:27 +0000 |
| commit | dd93315340cb597bf0c84f20e03803f042396c8b (patch) | |
| tree | b797ebc65a14766aea766b20a50ecfe8b1e30ab2 /vhook/watermark.c | |
| parent | 809b6a3138cf02a02f7f1888f9fa4852c11f9a5f (diff) | |
| download | ffmpeg-dd93315340cb597bf0c84f20e03803f042396c8b.tar.gz | |
Re-Add support for PNG or PNM as watermark images, which was broken
since the move to image2 API
Patch by Victor Paesa <wzrlpy@arsystel.com>
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
Diffstat (limited to 'vhook/watermark.c')
| -rw-r--r-- | vhook/watermark.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vhook/watermark.c b/vhook/watermark.c index c64e93ae91..692b2a52ce 100644 --- a/vhook/watermark.c +++ b/vhook/watermark.c @@ -421,6 +421,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; } |