...
 
Commits (6)
  • Ronald S. Bultje's avatar
    configure.ac: Require 0.9. · 5c3c33cb
    Ronald S. Bultje authored
    Original commit message from CVS:
    * configure.ac:
    Require 0.9.
    * ext/ffmpeg/Makefile.am:
    * ext/ffmpeg/gstffmpeg.c: (plugin_init):
    Disable protocol, demux, mux, enc.
    * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_class_init),
    (gst_ffmpegdec_init), (gst_ffmpegdec_setcaps),
    (gst_ffmpegdec_negotiate), (gst_ffmpegdec_frame),
    (gst_ffmpegdec_sink_event), (gst_ffmpegdec_chain),
    (gst_ffmpegdec_register):
    Port to 0.9.
    5c3c33cb
  • Ronald S. Bultje's avatar
    ext/ffmpeg/gstffmpegdec.c: That was not very smart... · fbb3678f
    Ronald S. Bultje authored
    Original commit message from CVS:
    * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_frame):
    That was not very smart...
    fbb3678f
  • Ronald S. Bultje's avatar
    ext/ffmpeg/gstffmpegdec.c: Implement accurate seeking, fix keyframe seeking. · 7a9479fe
    Ronald S. Bultje authored
    Original commit message from CVS:
    * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_open),
    (gst_ffmpegdec_frame), (gst_ffmpegdec_sink_event):
    Implement accurate seeking, fix keyframe seeking.
    7a9479fe
  • Wim Taymans's avatar
    ext/ffmpeg/: Some more porting. · aa56f95e
    Wim Taymans authored
    Original commit message from CVS:
    * ext/ffmpeg/Makefile.am:
    * ext/ffmpeg/gstffmpeg.c: (plugin_init):
    * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_query),
    (gst_ffmpegdec_event), (gst_ffmpegdec_open),
    (gst_ffmpegdec_setcaps), (gst_ffmpegdec_chain),
    (gst_ffmpegdec_change_state):
    * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_class_init),
    (gst_ffmpegenc_init), (gst_ffmpegenc_getcaps),
    (gst_ffmpegenc_setcaps), (gst_ffmpegenc_chain_video),
    (gst_ffmpegenc_chain_audio):
    Some more porting.
    Make the encoders compile, they don't seem to work yet
    though.
    aa56f95e
  • Luca Ognibene's avatar
    ext/ffmpeg/gstffmpegdec.c (gst_ffmpegdec_event) · bcda4228
    Luca Ognibene authored
    Original commit message from CVS:
    * ext/ffmpeg/gstffmpegdec.c (gst_ffmpegdec_event)
    (gst_ffmpegdec_query):
    Get the var before using it :) Fix
    segfaults on ffmpeg's event handling
    bcda4228
  • Ronald S. Bultje's avatar
    ext/ffmpeg/gstffmpegcodecmap.c: Buffer = miniobject, not boxed. · 0d6643f5
    Ronald S. Bultje authored
    Original commit message from CVS:
    * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_with_codecid):
    Buffer = miniobject, not boxed.
    0d6643f5
2005-06-30 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_with_codecid):
Buffer = miniobject, not boxed.
2005-05-26 Luca Ognibene <luogni@tin.it>
* ext/ffmpeg/gstffmpegdec.c (gst_ffmpegdec_event)
(gst_ffmpegdec_query):
Get the var before using it :) Fix
segfaults on ffmpeg's event handling
2005-05-18 Wim Taymans <wim@fluendo.com>
* ext/ffmpeg/Makefile.am:
* ext/ffmpeg/gstffmpeg.c: (plugin_init):
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_query),
(gst_ffmpegdec_event), (gst_ffmpegdec_open),
(gst_ffmpegdec_setcaps), (gst_ffmpegdec_chain),
(gst_ffmpegdec_change_state):
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_class_init),
(gst_ffmpegenc_init), (gst_ffmpegenc_getcaps),
(gst_ffmpegenc_setcaps), (gst_ffmpegenc_chain_video),
(gst_ffmpegenc_chain_audio):
Some more porting.
Make the encoders compile, they don't seem to work yet
though.
2005-02-20 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_open),
(gst_ffmpegdec_frame), (gst_ffmpegdec_sink_event):
Implement accurate seeking, fix keyframe seeking.
2005-02-05 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_frame):
That was not very smart...
2005-02-05 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* configure.ac:
Require 0.9.
* ext/ffmpeg/Makefile.am:
* ext/ffmpeg/gstffmpeg.c: (plugin_init):
Disable protocol, demux, mux, enc.
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_class_init),
(gst_ffmpegdec_init), (gst_ffmpegdec_setcaps),
(gst_ffmpegdec_negotiate), (gst_ffmpegdec_frame),
(gst_ffmpegdec_sink_event), (gst_ffmpegdec_chain),
(gst_ffmpegdec_register):
Port to 0.9.
2005-02-04 Jan Schmidt <thaytan@mad.scientist.com>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_frame),
......
common @ 28263064
Subproject commit b2638c100721f67b280c3b43b21f1ce1c9b5e316
Subproject commit 2826306411790bf8aa9298922aa59b126897431f
......@@ -12,19 +12,19 @@ AM_MAINTAINER_MODE
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
AS_VERSION(gst-ffmpeg, GST_FFMPEG_VERSION, 0, 8, 3, 1, GST_CVS="no", GST_CVS="yes")
AS_VERSION(gst-ffmpeg, GST_FFMPEG_VERSION, 0, 9, 0, 1, GST_CVS="no", GST_CVS="yes")
dnl we cheat here so we don't have to change the actual configure code bit
GST_PLUGINS_VERSION_NANO=$GST_FFMPEG_VERSION_NANO
dnl required GStreamer version
GST_REQ=0.8.4
GST_REQ=0.9.0
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
dnl our libraries and install dirs use major.minor as a version
#GST_MAJORMINOR=$GST_FFMPEG_VERSION_MAJOR.$GST_FFMPEG_VERSION_MINOR
dnl hack while GST_MAJORMINOR doesn't match the release
GST_MAJORMINOR=0.8
GST_MAJORMINOR=0.9
AC_SUBST(GST_MAJORMINOR)
dnl CURRENT, REVISION, AGE
......
......@@ -4,11 +4,11 @@ plugin_LTLIBRARIES = libgstffmpeg.la
libgstffmpeg_la_SOURCES = gstffmpeg.c \
gstffmpegcodecmap.c \
gstffmpegdec.c \
gstffmpegdemux.c \
gstffmpegenc.c \
gstffmpegmux.c \
gstffmpegprotocol.c \
gstffmpegcolorspace.c
gstffmpegenc.c
# gstffmpegdemux.c \
# gstffmpegmux.c \
# gstffmpegprotocol.c \
# gstffmpegcolorspace.c
libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) \
-I $(top_srcdir)/gst-libs/ext/ffmpeg/libavformat \
......
......@@ -68,9 +68,6 @@ gst_ffmpeg_log_callback (void * ptr, int level, const char * fmt, va_list vl)
static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_library_load ("gstbytestream"))
return FALSE;
GST_DEBUG_CATEGORY_INIT (ffmpeg_debug, "ffmpeg", 0, "FFmpeg elements");
#ifndef GST_DISABLE_GST_DEBUG
av_log_set_callback (gst_ffmpeg_log_callback);
......@@ -79,11 +76,11 @@ plugin_init (GstPlugin * plugin)
gst_ffmpegenc_register (plugin);
gst_ffmpegdec_register (plugin);
gst_ffmpegdemux_register (plugin);
//gst_ffmpegdemux_register (plugin);
/*gst_ffmpegmux_register (plugin); */
gst_ffmpegcsp_register (plugin);
//gst_ffmpegcsp_register (plugin);
register_protocol (&gstreamer_protocol);
//register_protocol (&gstreamer_protocol);
/* Now we can return the pointer to the newly created Plugin object. */
return TRUE;
......
......@@ -1173,7 +1173,7 @@ gst_ffmpeg_caps_with_codecid (enum CodecID codec_id,
/* extradata parsing (esds [mpeg4], wma/wmv, msmpeg4v1/2/3, etc.) */
if ((value = gst_structure_get_value (str, "codec_data"))) {
buf = g_value_get_boxed (value);
buf = GST_BUFFER (gst_value_get_mini_object (value));
context->extradata = av_mallocz (GST_BUFFER_SIZE (buf));
memcpy (context->extradata, GST_BUFFER_DATA (buf),
GST_BUFFER_SIZE (buf));
......
This diff is collapsed.
This diff is collapsed.