third-party-mirrors/spek
1
0
Fork 0
mirror of https://github.com/alexkay/spek.git synced 2025-06-14 14:22:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Kojevnikov 2010-07-24 14:02:55 +10:00
parent 3eeea1ae47
commit 20ea067403
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -51,6 +51,6 @@ Dependencies
* GTK+ >= 2.18 * GTK+ >= 2.18
* FFmpeg libraries: * FFmpeg libraries:
* libavcodec * libavcodec >= 52.56.0 (r22291)
* libavformat * libavformat
* libavutil * libavutil

2
configure.ac
View File

@ -24,7 +24,7 @@ AM_PROG_VALAC([0.7.0])
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_INTLTOOL([0.35]) 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]) PKG_CHECK_MODULES(SPEK, [$pkg_modules])
AC_SUBST(SPEK_CFLAGS) AC_SUBST(SPEK_CFLAGS)
AC_SUBST(SPEK_LIBS) AC_SUBST(SPEK_LIBS)

6
src/spek-audio.c
View File

@ -141,14 +141,8 @@ gint spek_audio_read (SpekAudioContext *cx) {
for (;;) { for (;;) {
while (cx->packet->size > 0) { while (cx->packet->size > 0) {
buffer_size = cx->buffer_size; buffer_size = cx->buffer_size;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT (52, 23, 0)
len = avcodec_decode_audio3 ( len = avcodec_decode_audio3 (
cx->codec_context, (int16_t *) cx->buffer, &buffer_size, cx->packet); 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) { if (len < 0) {
/* Error, skip the frame. */ /* Error, skip the frame. */
cx->packet->size = 0; cx->packet->size = 0;