mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-12 09:15:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

ffdec: fix build

Browse source
This commit is contained in:
Tim-Philipp Müller 2009-03-04 20:58:08 +00:00
parent 9eb48ddcda
commit 30805cd2c4
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/ffmpeg/gstffmpegdec.c
View file

@ -1781,7 +1781,7 @@ out_of_segment:
static gint static gint
gst_ffmpegdec_audio_frame (GstFFMpegDec * ffmpegdec, gst_ffmpegdec_audio_frame (GstFFMpegDec * ffmpegdec,
guint8 * data, guint size, AVCodec * in_plugin, guint8 * data, guint size,
GstClockTime in_timestamp, GstClockTime in_duration, GstClockTime in_timestamp, GstClockTime in_duration,
GstBuffer ** outbuf, GstFlowReturn * ret) GstBuffer ** outbuf, GstFlowReturn * ret)
{ {
@ -1860,7 +1860,7 @@ gst_ffmpegdec_audio_frame (GstFFMpegDec * ffmpegdec,
/* If we don't error out after the first failed read with the AAC decoder, /* If we don't error out after the first failed read with the AAC decoder,
* we must *not* carry on pushing data, else we'll cause segfaults... */ * we must *not* carry on pushing data, else we'll cause segfaults... */
if ((len == -1) && (oclass->in_plugin->id == CODEC_ID_AAC)) { if (len == -1 && in_plugin->id == CODEC_ID_AAC) {
GST_WARNING_OBJECT (ffmpegdec, "Decoding of AAC stream by FFMPEG failed."); GST_WARNING_OBJECT (ffmpegdec, "Decoding of AAC stream by FFMPEG failed.");
*ret = GST_FLOW_ERROR; *ret = GST_FLOW_ERROR;
} }
@ -1923,8 +1923,8 @@ gst_ffmpegdec_frame (GstFFMpegDec * ffmpegdec,
break; break;
case CODEC_TYPE_AUDIO: case CODEC_TYPE_AUDIO:
len = len =
gst_ffmpegdec_audio_frame (ffmpegdec, data, size, in_timestamp, gst_ffmpegdec_audio_frame (ffmpegdec, oclass->in_plugin, data, size,
in_duration, &outbuf, ret); in_timestamp, in_duration, &outbuf, ret);
/* if we did not get an output buffer and we have a pending discont, don't /* if we did not get an output buffer and we have a pending discont, don't
* clear the input timestamps, we will put them on the next buffer because * clear the input timestamps, we will put them on the next buffer because