[SCM] k9copy packaging branch, master, updated. 7492bd9fe43393dd7a668b6f0bdc50874b0527f0

[Eshat Cakar]

The following commit has been merged in the master branch:
commit 7492bd9fe43393dd7a668b6f0bdc50874b0527f0
Author: Eshat Cakar <info at eshat.de>
Date:   Sat Aug 20 22:32:48 2011 +0200

    Use seperate patch for source changes
---
 debian/patches/fix_deprecated_func.patch |   12 ++++++++++++
 debian/patches/series                    |    1 +
 src/import/k9avidecode.cpp               |    4 ++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/patches/fix_deprecated_func.patch b/debian/patches/fix_deprecated_func.patch
new file mode 100644
index 0000000..f0cdf1a
--- /dev/null
+++ b/debian/patches/fix_deprecated_func.patch
@@ -0,0 +1,12 @@
+Function has been deprecated for a long time
+--- a/src/import/k9avidecode.cpp
++++ b/src/import/k9avidecode.cpp
+@@ -243,7 +243,7 @@
+         if (packet.stream_index==m_videoStream) {
+             // Decode video frame
+             avcodec_decode_video(m_CodecCtx, m_Frame, &frameFinished,
+-                                 packet.data, packet.size);
++                                 &packet);
+ 
+             // Did we get a video frame?
+             if (frameFinished) {
diff --git a/debian/patches/series b/debian/patches/series
index cfdd589..0379092 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix_deprecated_func.patch
 fix-ftbfs-kfreebsd.patch
 german-spelling-error.patch
 fix-desktop-files.patch
diff --git a/src/import/k9avidecode.cpp b/src/import/k9avidecode.cpp
index 3fdd637..2741136 100644
--- a/src/import/k9avidecode.cpp
+++ b/src/import/k9avidecode.cpp
@@ -242,8 +242,8 @@ void k9AviDecode::readFrame(double _seconds) {
         // Is this a packet from the video stream?
         if (packet.stream_index==m_videoStream) {
             // Decode video frame
-            avcodec_decode_video2(m_CodecCtx, m_Frame, &frameFinished,
-                                 &packet);
+            avcodec_decode_video(m_CodecCtx, m_Frame, &frameFinished,
+                                 packet.data, packet.size);
 
             // Did we get a video frame?
             if (frameFinished) {

-- 
k9copy packaging