diff --git a/build/modules.conf.in b/build/modules.conf.in
index 485b526bda..041bfb6dc7 100644
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -120,6 +120,7 @@ formats/mod_sndfile
#formats/mod_ssml
formats/mod_tone_stream
#formats/mod_vlc
+formats/mod_png
#languages/mod_basic
#languages/mod_java
languages/mod_lua
diff --git a/conf/vanilla/autoload_configs/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml
index 1940561ec0..b01c56d351 100644
--- a/conf/vanilla/autoload_configs/modules.conf.xml
+++ b/conf/vanilla/autoload_configs/modules.conf.xml
@@ -98,6 +98,7 @@
+
diff --git a/src/mod/formats/mod_png/mod_png.c b/src/mod/formats/mod_png/mod_png.c
new file mode 100644
index 0000000000..8720de0226
--- /dev/null
+++ b/src/mod/formats/mod_png/mod_png.c
@@ -0,0 +1,205 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2015, Anthony Minessale II
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Seven Du
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * mod_png -- play a png as video
+ *
+ */
+
+#include
+
+#ifdef _MSC_VER
+// Disable MSVC warnings that suggest making code non-portable.
+#pragma warning(disable : 4996)
+#endif
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_png_load);
+SWITCH_MODULE_DEFINITION(mod_png, mod_png_load, NULL, NULL);
+
+struct png_file_context {
+ switch_memory_pool_t *pool;
+ switch_image_t *img;
+ int reads;
+ int sent;
+ int max;
+ int samples;
+};
+
+typedef struct png_file_context png_file_context_t;
+
+static switch_status_t png_file_open(switch_file_handle_t *handle, const char *path)
+{
+ png_file_context_t *context;
+ char *ext;
+ unsigned int flags = 0;
+
+ if ((ext = strrchr((char *)path, '.')) == 0) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Format\n");
+ return SWITCH_STATUS_GENERR;
+ }
+ ext++;
+
+ if ((context = (png_file_context_t *)switch_core_alloc(handle->memory_pool, sizeof(png_file_context_t))) == 0) {
+ return SWITCH_STATUS_MEMERR;
+ }
+
+ if (!switch_test_flag(handle, SWITCH_FILE_FLAG_VIDEO)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Video only\n");
+ return SWITCH_STATUS_GENERR;
+ }
+
+ memset(context, 0, sizeof(png_file_context_t));
+
+ if (!(context->img = switch_img_read_png(path))) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening %s\n", path);
+ return SWITCH_STATUS_GENERR;
+ }
+
+ if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) {
+ return SWITCH_STATUS_GENERR;
+ }
+
+ if (switch_test_flag(handle, SWITCH_FILE_FLAG_READ)) {
+ flags |= SWITCH_FOPEN_READ;
+ }
+
+ context->max = 10000;
+
+ if (handle->params) {
+ const char *max = switch_event_get_header(handle->params, "png_ms");
+ int tmp;
+
+ if (max) {
+ tmp = atol(max);
+ context->max = tmp;
+ }
+ }
+
+ if (context->max) {
+ context->samples = (handle->samplerate / 1000) * context->max;
+ }
+
+ handle->format = 0;
+ handle->sections = 0;
+ handle->seekable = 0;
+ handle->speed = 0;
+ handle->pos = 0;
+ handle->private_info = context;
+ context->pool = handle->memory_pool;
+
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Opening File [%s]\n", path);
+
+ return SWITCH_STATUS_SUCCESS;
+
+}
+
+static switch_status_t png_file_close(switch_file_handle_t *handle)
+{
+ png_file_context_t *context = (png_file_context_t *)handle->private_info;
+
+ switch_img_free(&context->img);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t png_file_read(switch_file_handle_t *handle, void *data, size_t *len)
+{
+
+ png_file_context_t *context = (png_file_context_t *)handle->private_info;
+
+ if (!context->img || !context->samples) {
+ return SWITCH_STATUS_FALSE;
+ }
+
+ if (context->samples > 0) {
+ if (*len >= context->samples) {
+ *len = context->samples;
+ }
+
+ context->samples -= *len;
+ }
+
+ if (!context->samples) {
+ return SWITCH_STATUS_FALSE;
+ }
+
+ memset(data, 0, *len * 2 * handle->channels);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t png_file_read_video(switch_file_handle_t *handle, switch_frame_t *frame, switch_video_read_flag_t flags)
+{
+ png_file_context_t *context = (png_file_context_t *)handle->private_info;
+ switch_image_t *dup = NULL;
+
+ if (!context->img || !context->samples) {
+ return SWITCH_STATUS_FALSE;
+ }
+
+ if ((context->reads++ % 20) == 0) {
+ switch_img_copy(context->img, &dup);
+ frame->img = dup;
+ context->sent++;
+ } else {
+ return SWITCH_STATUS_BREAK;
+ }
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+
+static char *supported_formats[2] = { 0 };
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_png_load)
+{
+ switch_file_interface_t *file_interface;
+
+ supported_formats[0] = (char *)"png";
+
+ /* connect my internal structure to the blank pointer passed to me */
+ *module_interface = switch_loadable_module_create_module_interface(pool, modname);
+
+ file_interface = (switch_file_interface_t *)switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE);
+ file_interface->interface_name = modname;
+ file_interface->extens = supported_formats;
+ file_interface->file_open = png_file_open;
+ file_interface->file_close = png_file_close;
+ file_interface->file_read = png_file_read;
+ file_interface->file_read_video = png_file_read_video;
+
+ /* indicate that the module should continue to be loaded */
+ return SWITCH_STATUS_SUCCESS;
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */