diff --git a/gstreamer1-libav-temp-ffmpeg-3.4-api.patch b/gstreamer1-libav-temp-ffmpeg-3.4-api.patch deleted file mode 100644 index 9558713..0000000 --- a/gstreamer1-libav-temp-ffmpeg-3.4-api.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- gst-libav-1.12.3.orig/ext/libav/gstavviddec.c 2017-08-10 17:56:34.000000000 +0200 -+++ gst-libav-1.12.3.orig/ext/libav/gstavviddec.c 2017-11-04 21:48:00.784354386 +0100 -@@ -1525,8 +1525,20 @@ - * See https://bugzilla.gnome.org/show_bug.cgi?id=726020 - */ - GST_VIDEO_DECODER_STREAM_UNLOCK (ffmpegdec); -- len = avcodec_decode_video2 (ffmpegdec->context, -- ffmpegdec->picture, have_data, &packet); -+ *have_data = 0; -+ if (size > 0) { -+ len = avcodec_send_packet(ffmpegdec->context, &packet); -+ if (len == AVERROR(EAGAIN)) { -+ len = 0; -+ } else { -+ len = size; -+ } -+ if (len >= 0) { -+ int result = avcodec_receive_frame(ffmpegdec->context, ffmpegdec->picture); -+ if (result == 0) -+ *have_data = 1; -+ } -+ } - GST_VIDEO_DECODER_STREAM_LOCK (ffmpegdec); - - GST_DEBUG_OBJECT (ffmpegdec, "after decode: len %d, have_data %d", diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index fe27d80..df992a8 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,15 +1,12 @@ Name: gstreamer1-libav -Version: 1.12.3 -Release: 3%{?dist} +Version: 1.12.4 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch -%if 0%{?fedora} > 27 || 0%{?rhel} > 8 -Patch1: %{name}-temp-ffmpeg-3.4-api.patch -%endif BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: orc-devel @@ -75,6 +72,10 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Mon Dec 11 2017 Leigh Scott - 1.12.4-1 +- Update to 1.12.4 +- Remove patch for FFMpeg 3.4 APIs (fixed in ffmpeg-3.4.1) + * Sat Nov 18 2017 Simone Caronni - 1.12.3-3 - Temporary patch for FFMpeg 3.4 APIs. diff --git a/sources b/sources index e247d09..caf32b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -81f62d58279108698b321209fc6696ce gst-libav-1.12.3.tar.xz +8a851bf2e475e90a3fdac9506e3e4dbd gst-libav-1.12.4.tar.xz