mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-30 04:00:37 +00:00
ext/ffmpeg/:
Original commit message from CVS: Patch by: Ole Andr Vadla Ravns <ole dot andre dot ravnas at tandberg dot com> * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_with_codecid): * ext/ffmpeg/gstffmpegmux.c: (gst_ffmpegmux_init):
This commit is contained in:
parent
f85c737410
commit
3627dbca5a
4 changed files with 10 additions and 3 deletions
|
@ -1,3 +1,10 @@
|
|||
2007-11-08 Edward Hervey <bilboed@bilboed.com>
|
||||
|
||||
Patch by: Ole André Vadla Ravnås <ole dot andre dot ravnas at tandberg dot com>
|
||||
|
||||
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_with_codecid):
|
||||
* ext/ffmpeg/gstffmpegmux.c: (gst_ffmpegmux_init):
|
||||
|
||||
2007-11-03 Edward Hervey <bilboed@bilboed.com>
|
||||
|
||||
* ext/ffmpeg/gstffmpeg.c: (gst_ffmpeg_avcodec_open),
|
||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
|||
Subproject commit 34d7d649b972ea4915611a6ed88f01613bf32777
|
||||
Subproject commit 423e2ea96b5f79281f4dd20d734bd968b3d95e89
|
|
@ -1584,7 +1584,7 @@ gst_ffmpeg_caps_with_codecid (enum CodecID codec_id,
|
|||
|
||||
flags = GUINT16_FROM_LE (flags);
|
||||
|
||||
memcpy (context->extradata + 0x62, &flags, 2);
|
||||
memcpy ((gchar *) context->extradata + 0x62, &flags, 2);
|
||||
context->extradata_size = 0x64;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -206,7 +206,7 @@ gst_ffmpegmux_init (GstFFMpegMux * ffmpegmux, GstFFMpegMuxClass * g_class)
|
|||
ffmpegmux->context = g_new0 (AVFormatContext, 1);
|
||||
ffmpegmux->context->oformat = oclass->in_plugin;
|
||||
ffmpegmux->context->nb_streams = 0;
|
||||
snprintf (ffmpegmux->context->filename,
|
||||
g_snprintf (ffmpegmux->context->filename,
|
||||
sizeof (ffmpegmux->context->filename),
|
||||
"gstreamer://%p", ffmpegmux->srcpad);
|
||||
ffmpegmux->opened = FALSE;
|
||||
|
|
Loading…
Reference in a new issue