diff options
| author | Mathieu Duponchelle <mathieu@centricular.com> | 2018-07-13 17:24:07 +0200 |
|---|---|---|
| committer | Mathieu Duponchelle <mathieu@centricular.com> | 2018-07-13 17:24:07 +0200 |
| commit | dd37a553ac60f16bdfc6f7d82532f0a6089add14 (patch) | |
| tree | 44eff905a53ede3f6119df8f694feb7b1da5c701 /ext | |
| parent | 70d9f923dccdecab1df8abcd5a6a4715557f487a (diff) | |
| download | gst-libav-dd37a553ac60f16bdfc6f7d82532f0a6089add14.tar.gz | |
av*dec: Ignore decoding errors
We were ignoring these before the port to 4.0, interpreting them
as GST_FLOW_ERROR / GST_ELEMENT_ERROR causes check failures.
We should start using GST_*_DECODER_ERROR in latter commits,
for now simply restore the previous behaviour.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/libav/gstavauddec.c | 5 | ||||
| -rw-r--r-- | ext/libav/gstavviddec.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ext/libav/gstavauddec.c b/ext/libav/gstavauddec.c index 7810dc6..f202454 100644 --- a/ext/libav/gstavauddec.c +++ b/ext/libav/gstavauddec.c @@ -580,9 +580,8 @@ gst_ffmpegauddec_audio_frame (GstFFMpegAudDec * ffmpegdec, GST_WARNING_OBJECT (ffmpegdec, "Tried to receive frame on a flushed context"); } else if (res < 0) { - *ret = GST_FLOW_ERROR; - GST_ELEMENT_ERROR (ffmpegdec, STREAM, DECODE, ("Decoding problem"), - ("Legitimate decoding error")); + *ret = GST_FLOW_OK; + GST_WARNING_OBJECT (ffmpegdec, "Legitimate decoding error"); } beach: diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c index e3ae04f..acb1ce9 100644 --- a/ext/libav/gstavviddec.c +++ b/ext/libav/gstavviddec.c @@ -1490,9 +1490,8 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec, "Tried to receive frame on a flushed context"); goto beach; } else if (res < 0) { - *ret = GST_FLOW_ERROR; - GST_ELEMENT_ERROR (ffmpegdec, STREAM, DECODE, ("Decoding problem"), - ("Legitimate decoding error")); + *ret = GST_FLOW_OK; + GST_WARNING_OBJECT (ffmpegdec, "Legitimate decoding error"); goto beach; } |