spek

Acoustic spectrum analyser
git clone http://git.hanabi.in/repos/spek.git
Log | Files | Refs | README

commit 20ea067403d0d891a5c52e538f4a0816c2661a43
parent 3eeea1ae47cbee8ee29b51376b3b604516d7bd5f
Author: Alexander Kojevnikov <alexander@kojevnikov.com>
Date:   Sat, 24 Jul 2010 14:02:55 +1000

Undo the previous commit, we still need lavc >= 52.56.0 for avfft

Diffstat:
MNEWS | 2+-
Mconfigure.ac | 2+-
Msrc/spek-audio.c | 6------
3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS @@ -51,6 +51,6 @@ Dependencies * GTK+ >= 2.18 * FFmpeg libraries: - * libavcodec + * libavcodec >= 52.56.0 (r22291) * libavformat * libavutil diff --git a/configure.ac b/configure.ac @@ -24,7 +24,7 @@ AM_PROG_VALAC([0.7.0]) AC_PROG_INSTALL AC_PROG_INTLTOOL([0.35]) -pkg_modules="gtk+-2.0 >= 2.18.0 libavformat libavcodec libavutil" +pkg_modules="gtk+-2.0 >= 2.18.0 libavformat libavcodec >= 52.56.0 libavutil" PKG_CHECK_MODULES(SPEK, [$pkg_modules]) AC_SUBST(SPEK_CFLAGS) AC_SUBST(SPEK_LIBS) diff --git a/src/spek-audio.c b/src/spek-audio.c @@ -141,14 +141,8 @@ gint spek_audio_read (SpekAudioContext *cx) { for (;;) { while (cx->packet->size > 0) { buffer_size = cx->buffer_size; -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT (52, 23, 0) len = avcodec_decode_audio3 ( cx->codec_context, (int16_t *) cx->buffer, &buffer_size, cx->packet); -#else - len = avcodec_decode_audio2 ( - cx->codec_context, (int16_t *) cx->buffer, &buffer_size, - cx->packet->data, cx->packet->size); -#endif if (len < 0) { /* Error, skip the frame. */ cx->packet->size = 0;