diff --git a/libucil-0.9.8-segv.patch b/libucil-0.9.8-segv.patch index b3b6fcd..5089258 100644 --- a/libucil-0.9.8-segv.patch +++ b/libucil-0.9.8-segv.patch @@ -1,5 +1,8 @@ + src/ucil_theora.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + diff --git a/src/ucil_theora.c b/src/ucil_theora.c -index 3f6e1ca..7cfb0f4 100644 +index 3f6e1ca..0919a97 100644 --- a/src/ucil_theora.c +++ b/src/ucil_theora.c @@ -518,7 +518,7 @@ static void fill_frames( ucil_theora_video_file_object_t *vobj, unicap_data_buff @@ -29,3 +32,12 @@ index 3f6e1ca..7cfb0f4 100644 last_data_buffer->flags &= ~UNICAP_FLAGS_BUFFER_LOCKED; sem_wait( &vobj->lock ); g_queue_push_head( vobj->empty_queue, vobj->last_frame ); +@@ -911,7 +911,7 @@ static void *ucil_theora_encode_thread( ucil_theora_video_file_object_t *vobj ) + } + #endif + +- last_data_buffer = (unicap_data_buffer_t *)vobj->last_frame->data; ++ last_data_buffer = vobj->last_frame; + if( vobj->downsize > 1 || vobj->requires_resizing_frames ) + { + yuv.y = ds_y_buffer; diff --git a/libucil.spec b/libucil.spec index 11f3e73..ab757ea 100644 --- a/libucil.spec +++ b/libucil.spec @@ -1,7 +1,7 @@ Summary: Library to render text and graphic overlays onto video images Name: libucil Version: 0.9.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.unicap-imaging.org/ @@ -10,7 +10,7 @@ Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz # Fix commited in upstream r62 Patch0: libucil-0.9.8-alsa.patch -# Fix commited in upstream r61 +# Part of the fix commited in upstream r61 Patch1: libucil-0.9.8-segv.patch BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext, gtk-doc >= 1.4 @@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/%{name} %changelog +* Wed Aug 25 2010 Kamil Dudka 0.9.8-4 +- fix SIGSEGV in ucil_theora_encode_thread (#627161) + * Wed Jun 02 2010 Kamil Dudka 0.9.8-3 - fix SIGSEGV in ucil_alsa_fill_audio_buffer (#572966) - fix SIGSEGV in ucil_theora_encode_thread (#595863)