diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-10 17:42:48 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-10 17:42:48 -0500 |
| commit | baed758af333e84845c82b0ac438f1a8ed49afc0 (patch) | |
| tree | 41f543a8557ea4b01c2c0f37940495966bb098d8 /redhat/applications/k9copy | |
| parent | 4dd12b757689fde246b6e7608d2d44b9bb147a60 (diff) | |
| parent | 93915c7dddafd2f8e81bb0d9859d41d1e2c0e175 (diff) | |
| download | tde-packaging-baed758af333e84845c82b0ac438f1a8ed49afc0.tar.gz tde-packaging-baed758af333e84845c82b0ac438f1a8ed49afc0.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/applications/k9copy')
| -rw-r--r-- | redhat/applications/k9copy/k9copy-14.0.0-fix_author.patch | 25 | ||||
| -rw-r--r-- | redhat/applications/k9copy/k9copy-14.0.0.spec | 2 |
2 files changed, 0 insertions, 27 deletions
diff --git a/redhat/applications/k9copy/k9copy-14.0.0-fix_author.patch b/redhat/applications/k9copy/k9copy-14.0.0-fix_author.patch deleted file mode 100644 index 057fad5b9..000000000 --- a/redhat/applications/k9copy/k9copy-14.0.0-fix_author.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- trinity-k9copy/k9author/k9avidecode.cpp.k9author 2013-07-21 09:56:44.000000000 +0200 -+++ trinity-k9copy/k9author/k9avidecode.cpp 2013-08-02 12:16:55.398266088 +0200 -@@ -119,6 +119,13 @@ - m_opened=false; - - glibref++; -+ -+ m_FormatCtx = NULL; -+ m_CodecCtx = NULL; -+ m_Codec = NULL; -+ m_Frame = NULL; -+ m_FrameRGB = NULL; -+ m_buffer = NULL; - } - - -@@ -148,7 +155,7 @@ - // Open video file - if ( - # if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0) -- avformat_open_input(&m_FormatCtx, _fileName.utf8(), 0, 0)!=0 -+ avformat_open_input(&m_FormatCtx, _fileName.utf8(), NULL, NULL)!=0 - # else - av_open_input_file(&m_FormatCtx, _fileName.utf8(), NULL, 0, NULL)!=0 - # endif diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy-14.0.0.spec index 74c5402da..13f59ddd9 100644 --- a/redhat/applications/k9copy/k9copy-14.0.0.spec +++ b/redhat/applications/k9copy/k9copy-14.0.0.spec @@ -43,7 +43,6 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Patch1: k9copy-14.0.0-fix_k3b_link.patch Patch2: k9copy-3.5.13.2-ftbfs.patch -Patch3: k9copy-14.0.0-fix_author.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -73,7 +72,6 @@ This is the Trinity version. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch1 -p1 -b .ftbfs %patch2 -p1 -b .ftbfs -%patch3 -p1 -b .k9author # Removes internal dvdread headers %__rm -rf dvdread |