mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix for latest ffmpeg

Browse source 
Original commit message from CVS:
Fix for latest ffmpeg
This commit is contained in:
Wim Taymans 2002-12-28 00:11:56 +00:00
parent 63c54e2350
commit 631ae96d59
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/ffmpeg/gstffmpegdec.c
View file

@ -172,10 +172,12 @@ gst_ffmpegdec_sinkconnect (GstPad *pad, GstCaps *caps)
ffmpegdec->context->bit_rate = 0; ffmpegdec->context->bit_rate = 0;
/* FIXME bug in ffmpeg */ /* FIXME bug in ffmpeg */
/*
if (avcodec_open (ffmpegdec->context, avcodec_find_encoder(CODEC_ID_MPEG1VIDEO)) <0 ) { if (avcodec_open (ffmpegdec->context, avcodec_find_encoder(CODEC_ID_MPEG1VIDEO)) <0 ) {
g_warning ("ffmpegdec: could not open codec"); g_warning ("ffmpegdec: could not open codec");
return GST_PAD_CONNECT_REFUSED; return GST_PAD_CONNECT_REFUSED;
} }
*/
if (avcodec_open (ffmpegdec->context, oclass->in_plugin) < 0) { if (avcodec_open (ffmpegdec->context, oclass->in_plugin) < 0) {
g_warning ("ffmpegdec: could not open codec"); g_warning ("ffmpegdec: could not open codec");
@ -189,7 +191,7 @@ gst_ffmpegdec_init(GstFFMpegDec *ffmpegdec)
{ {
GstFFMpegDecClass *oclass = (GstFFMpegDecClass*)(G_OBJECT_GET_CLASS (ffmpegdec)); GstFFMpegDecClass *oclass = (GstFFMpegDecClass*)(G_OBJECT_GET_CLASS (ffmpegdec));
ffmpegdec->context = g_malloc0 (sizeof (AVCodecContext)); ffmpegdec->context = avcodec_alloc_context();
ffmpegdec->sinkpad = gst_pad_new_from_template (oclass->templ, "sink"); ffmpegdec->sinkpad = gst_pad_new_from_template (oclass->templ, "sink");
gst_pad_set_connect_function (ffmpegdec->sinkpad, gst_ffmpegdec_sinkconnect); gst_pad_set_connect_function (ffmpegdec->sinkpad, gst_ffmpegdec_sinkconnect);

2
ext/ffmpeg/gstffmpegenc.c
View file

@ -285,7 +285,7 @@ gst_ffmpegenc_init(GstFFMpegEnc *ffmpegenc)
{ {
GstFFMpegEncClass *oclass = (GstFFMpegEncClass*)(G_OBJECT_GET_CLASS (ffmpegenc)); GstFFMpegEncClass *oclass = (GstFFMpegEncClass*)(G_OBJECT_GET_CLASS (ffmpegenc));
ffmpegenc->context = g_malloc0 (sizeof (AVCodecContext)); ffmpegenc->context = avcodec_alloc_context();
if (oclass->in_plugin->type == CODEC_TYPE_VIDEO) { if (oclass->in_plugin->type == CODEC_TYPE_VIDEO) {
ffmpegenc->sinkpad = gst_pad_new_from_template ( ffmpegenc->sinkpad = gst_pad_new_from_template (

2
ext/ffmpeg/gstffmpegmux.c
View file

@ -193,7 +193,7 @@ gst_ffmpegmux_init(GstFFMpegMux *ffmpegmux)
{ {
GstFFMpegMuxClass *oclass = (GstFFMpegMuxClass*)(G_OBJECT_GET_CLASS (ffmpegmux)); GstFFMpegMuxClass *oclass = (GstFFMpegMuxClass*)(G_OBJECT_GET_CLASS (ffmpegmux));
ffmpegmux->context = g_malloc0 (sizeof (AVCodecContext)); ffmpegmux->context = avcodec_alloc_context();
ffmpegmux->sinkpad = gst_pad_new_from_template ( ffmpegmux->sinkpad = gst_pad_new_from_template (
GST_PAD_TEMPLATE_GET (gst_ffmpegmux_sink_factory), "sink"); GST_PAD_TEMPLATE_GET (gst_ffmpegmux_sink_factory), "sink");