Package: openmovieeditor
Version: 0.0.20080102-2.2
Severity: important
Tags: patch
ffmpeg has changed the meaning of certain parameters for the function
avcodec_decode_audio2. In particular data_size must be initialized to
the size of the buffer.
I updated the 04_ffmpeg_headers.dpatch to initialize correctly this
parameter.
With this update, I get back the audio in the result (i.e. movie
rendered). I still have no sound in openmovieeditor however.
For those who will read this bug report and expect to have sound back
into the editor itself, consider using openmovieeditor dev. version. The
viewer now use gmerlin-avdec and is excellent (video and audio are
perfect). So don't waste time to try to solve the "no sound in editor",
jump to not-yet shipped gmerlin-avdec package and build openmovieeditor
using dev darcs repository (works nice as of today 2009/09/04).
Regards
Sylvain Le Gall
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.29-2-amd64 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages openmovieeditor depends on:
ii libavcodec52 4:0.5+svn20090609-2 ffmpeg codec library
ii libavformat52 4:0.5+svn20090609-2 ffmpeg file format library
ii libavutil49 4:0.5+svn20090609-2 ffmpeg utility library
ii libc6 2.9-25 GNU C Library: Shared libraries
ii libfltk1.1 1.1.9-6 Fast Light Toolkit - shared librar
ii libgavl1 1.1.1-1 low level audio and video library
ii libgcc1 1:4.4.1-3 GCC support library
ii libgl1-mesa-glx [lib 7.5-3 A free implementation of the OpenG
ii libjack0 0.116.2+svn3592-2 JACK Audio Connection Kit (librari
ii libmpeg3-1 1.5.4-5 MPEG streams decoding library
ii libquicktime1 2:1.1.2+debian-1 library for reading and writing Qu
ii libsamplerate0 0.1.7-2 audio rate conversion library
ii libsndfile1 1.0.20-1+b1 Library for reading/writing audio
ii libstdc++6 4.4.1-3 The GNU Standard C++ Library v3
ii libswscale0 4:0.5+svn20090609-2 ffmpeg video scaling library
ii libx11-6 2:1.2.2-1 X11 client-side library
ii zlib1g 1:1.2.3.3.dfsg-15 compression library - runtime
openmovieeditor recommends no packages.
openmovieeditor suggests no packages.
-- no debconf information
#! /bin/sh /usr/share/dpatch/dpatch-run
## 04_ffmpeg_headers.dpatch by Fabrice Coutadeur
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix location of ffmpeg headers
@DPATCH@
diff -urNad openmovieeditor-0.0.20080102~/src/AudioFileFfmpeg.H openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.H
--- openmovieeditor-0.0.20080102~/src/AudioFileFfmpeg.H 2009-09-05 19:23:14.000000000 +0200
+++ openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.H 2009-09-05 19:23:50.000000000 +0200
@@ -24,8 +24,8 @@
#ifdef AVCODEC
extern "C" {
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
}
#include "global_includes.H"
diff -urNad openmovieeditor-0.0.20080102~/src/AudioFileFfmpeg.cxx openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.cxx
--- openmovieeditor-0.0.20080102~/src/AudioFileFfmpeg.cxx 2009-09-05 19:23:39.000000000 +0200
+++ openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.cxx 2009-09-05 19:24:28.000000000 +0200
@@ -130,9 +130,9 @@
ret = av_read_frame( m_formatContext, &m_packet );
int len = m_packet.size;
uint8_t *ptr = m_packet.data;
- int data_size;
+ int data_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
while ( ptr != NULL && ret >= 0 && m_packet.stream_index == m_audioStream && len > 0 ) {
- ret = avcodec_decode_audio( m_codecContext, m_tmpBuffer, &data_size, ptr, len );
+ ret = avcodec_decode_audio2( m_codecContext, m_tmpBuffer, &data_size, ptr, len );
if ( ret < 0 ) {
ret = 0;
break;
diff -urNad openmovieeditor-0.0.20080102~/src/VideoFileFfmpeg.H openmovieeditor-0.0.20080102/src/VideoFileFfmpeg.H
--- openmovieeditor-0.0.20080102~/src/VideoFileFfmpeg.H 2009-09-05 19:23:14.000000000 +0200
+++ openmovieeditor-0.0.20080102/src/VideoFileFfmpeg.H 2009-09-05 19:23:50.000000000 +0200
@@ -23,10 +23,10 @@
#ifdef AVCODEC
extern "C" {
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
#ifdef SWSCALE
- #include <ffmpeg/swscale.h>
+ #include <libswscale/swscale.h>
#endif /* SWSCALE */
}
diff -urNad openmovieeditor-0.0.20080102~/src/nle_main.cxx openmovieeditor-0.0.20080102/src/nle_main.cxx
--- openmovieeditor-0.0.20080102~/src/nle_main.cxx 2009-09-05 19:23:14.000000000 +0200
+++ openmovieeditor-0.0.20080102/src/nle_main.cxx 2009-09-05 19:23:50.000000000 +0200
@@ -31,7 +31,7 @@
#ifdef AVCODEC
extern "C" {
- #include <ffmpeg/avformat.h>
+ #include <libavformat/avformat.h>
}
#endif
