[libdvdnav: 3/4] Merge branch 'f18' into f19

[Dominik Mierzejewski]

commit 3e448e0fc57c99a2cf338d599f955480b3805df2
Merge: feec397 2dcf3a6
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Tue Sep 10 00:26:26 2013 +0200

    Merge branch 'f18' into f19
    
    Conflicts:
    	libdvdnav.spec

 libdvdnav-pgc-cell_playback.patch |   12 ++++++++++++
 libdvdnav.spec                    |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --cc libdvdnav.spec
index 1f1eb16,2a717f3..227d154
--- a/libdvdnav.spec
+++ b/libdvdnav.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           libdvdnav
  Version:        4.2.0
--Release:        4%{?dist}
++Release:        5%{?dist}
  Summary:        A library for reading DVD video discs based on Ogle code
  
  Group:          System Environment/Libraries
@@@ -78,9 -81,9 +81,12 @@@ pop
  %{_libdir}/pkgconfig/dvdnavmini.pc
  
  %changelog
 -* Tue Sep 10 2013 Dominik Mierzejewski <rpm[AT]greysector.net> 4.2.0-4
++* Tue Sep 10 2013 Dominik Mierzejewski <rpm[AT]greysector.net> 4.2.0-5
+ - fix segfault when cell is empty, patch by Simo Sorce, bug #902037
+ 
 +* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
  * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild