diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-03-04 20:58:08 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-03-04 20:58:08 +0000 |
| commit | 30805cd2c476020d929954af263e4aa85dbe9759 (patch) | |
| tree | 68a8682633fb708f70e18f05fa45902a71904580 | |
| parent | 9eb48ddcdab4982106c595508f96704e0cff5610 (diff) | |
| download | gst-libav-30805cd2c476020d929954af263e4aa85dbe9759.tar.gz | |
ffdec: fix build
| -rw-r--r-- | ext/ffmpeg/gstffmpegdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index 304604b..7d80931 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -1781,7 +1781,7 @@ out_of_segment: static gint gst_ffmpegdec_audio_frame (GstFFMpegDec * ffmpegdec, - guint8 * data, guint size, + AVCodec * in_plugin, guint8 * data, guint size, GstClockTime in_timestamp, GstClockTime in_duration, 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, * 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."); *ret = GST_FLOW_ERROR; } @@ -1923,8 +1923,8 @@ gst_ffmpegdec_frame (GstFFMpegDec * ffmpegdec, break; case CODEC_TYPE_AUDIO: len = - gst_ffmpegdec_audio_frame (ffmpegdec, data, size, in_timestamp, - in_duration, &outbuf, ret); + gst_ffmpegdec_audio_frame (ffmpegdec, oclass->in_plugin, data, size, + in_timestamp, in_duration, &outbuf, ret); /* 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 |