Commit df305f76 authored by Sebastien Moutte's avatar Sebastien Moutte Committed by Wim Taymans

ext/ffmpeg/: Make stuff compile on Visual Studio 6.

Original commit message from CVS:
Patch by: Sebastien Moutte <sebastien at moutte dot net>
* ext/ffmpeg/gstffmpeg.c: (plugin_init):
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ff_vid_caps_new),
(gst_ff_aud_caps_new), (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_pixfmt_to_caps), (gst_ffmpeg_smpfmt_to_caps),
(gst_ffmpeg_init_pix_fmt_info):
* ext/ffmpeg/gstffmpegcodecmap.h:
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_send_event):
* ext/ffmpeg/gstffmpegprotocol.c:
Make stuff compile on Visual Studio 6.
Convert some crach macros to functions.
Convert some static tables to _init functions.
Fixes #343951.
parent 82606642
2006-09-06 Wim Taymans <wim@fluendo.com>
Patch by: Sebastien Moutte <sebastien at moutte dot net>
* ext/ffmpeg/gstffmpeg.c: (plugin_init):
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ff_vid_caps_new),
(gst_ff_aud_caps_new), (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_pixfmt_to_caps), (gst_ffmpeg_smpfmt_to_caps),
(gst_ffmpeg_init_pix_fmt_info):
* ext/ffmpeg/gstffmpegcodecmap.h:
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_send_event):
* ext/ffmpeg/gstffmpegprotocol.c:
Make stuff compile on Visual Studio 6.
Convert some crach macros to functions.
Convert some static tables to _init functions.
Fixes #343951.
2006-09-06 Wim Taymans <wim@fluendo.com>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_chain):
......
......@@ -34,6 +34,7 @@
#endif
#include "gstffmpeg.h"
#include "gstffmpegcodecmap.h"
GST_DEBUG_CATEGORY (ffmpeg_debug);
......@@ -105,6 +106,9 @@ plugin_init (GstPlugin * plugin)
av_log_set_callback (gst_ffmpeg_log_callback);
#endif
gst_ffmpeg_init_pix_fmt_info();
av_register_all ();
gst_ffmpegenc_register (plugin);
......
This diff is collapsed.
......@@ -165,4 +165,7 @@ gst_ffmpeg_time_gst_to_ff (guint64 time, AVRational base)
return out;
}
void
gst_ffmpeg_init_pix_fmt_info();
#endif /* __GST_FFMPEG_CODECMAP_H__ */
......@@ -606,8 +606,8 @@ gst_ffmpegdemux_send_event (GstElement * element, GstEvent *event)
case GST_EVENT_SEEK:
GST_OBJECT_LOCK (demux);
if (!demux->opened) {
GST_DEBUG_OBJECT (demux, "caching seek event");
GstEvent **event_p = &demux->seek_event;
GST_DEBUG_OBJECT (demux, "caching seek event");
gst_event_replace (event_p, event);
GST_OBJECT_UNLOCK (demux);
res = TRUE;
......
......@@ -262,11 +262,12 @@ gst_ffmpegdata_close (URLContext * h)
return 0;
}
URLProtocol gstreamer_protocol = {
.name = "gstreamer",
.url_open = gst_ffmpegdata_open,
.url_read = gst_ffmpegdata_read,
.url_write = gst_ffmpegdata_write,
.url_seek = gst_ffmpegdata_seek,
.url_close = gst_ffmpegdata_close,
/*.name = */"gstreamer",
/*.url_open = */gst_ffmpegdata_open,
/*.url_read = */gst_ffmpegdata_read,
/*.url_write = */gst_ffmpegdata_write,
/*.url_seek = */gst_ffmpegdata_seek,
/*.url_close = */gst_ffmpegdata_close,
};
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment