[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [k3b] plugins/decoder/ffmpeg: FFMPEG removed the deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE define
From:       Michael Jansen <kde () michael-jansen ! biz>
Date:       2013-11-18 13:52:51
Message-ID: E1ViPFz-00028v-VO () scm ! kde ! org
[Download RAW message or body]

Git commit b0e04c0f1fa9c014e284ea6b4e28bfd282484fe4 by Michael Jansen.
Committed on 16/10/2013 at 21:26.
Pushed by mjansen into branch 'master'.

FFMPEG removed the deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE define

Found the value on the web. Where is given as a comment in the change.

M  +7    -0    plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp

http://commits.kde.org/k3b/b0e04c0f1fa9c014e284ea6b4e28bfd282484fe4

diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
index 3bd2d54..5451fd3 100644
--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
@@ -67,6 +67,13 @@ extern "C" {
 #  define CODEC_ID_MP3 CODEC_ID_MP3LAME
 #endif
 
+// Has been deprecated for ages. Now removed. For now do what ffmpeg does
+// http://ffmpeg.org/pipermail/ffmpeg-cvslog/2012-August/053785.html
+// 192000 = 1 second of 48khz 32bit audio
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
+#endif
+
 K3bFFMpegWrapper* K3bFFMpegWrapper::s_instance = 0;
 
 
[prev in list] [next in list] [prev in thread] [next in thread]