commit bd7d16e841ea42b7bb9969055bf5ec68520411e9
parent 1135cd9f4382443970ba31ce20fbfd319742159d
Author: Christian Grothoff <christian@grothoff.org>
Date: Sun, 22 Dec 2013 22:45:46 +0000
-downgrade symbols for libav 0.9 compatibility
Diffstat:
15 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+Sun Dec 22 23:11:28 CET 2013
+ Releasing GNU libextractor 1.3. -CG
+
Sun Dec 22 17:47:38 CET 2013
Fixing issue where one plugin blocked indefinitely could prevent
others from ever (successfully) seeking and thus extracting data. -CG
diff --git a/configure.ac b/configure.ac
@@ -676,7 +676,7 @@ then
new_ffmpeg=0
AC_CHECK_HEADERS([libavutil/avutil.h libavformat/avformat.h libavcodec/avcodec.h libavutil/frame.h],
AC_CHECK_HEADERS([libavresample/avresample.h],
- AC_CHECK_LIB(avutil, av_frame_alloc,
+ AC_CHECK_LIB(avutil, av_audio_fifo_alloc,
new_ffmpeg=1)))
AC_CHECK_LIB(swscale, sws_getContext,
diff --git a/po/de.po b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.14\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2013-12-22 17:50+0100\n"
+"POT-Creation-Date: 2013-12-22 23:11+0100\n"
"PO-Revision-Date: 2007-03-23 23:16+0100\n"
"Last-Translator: Nils Durner <durner@gnunet.org>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -143,7 +143,7 @@ msgstr "%% BibTeX Datei\n"
msgid "Keywords for file %s:\n"
msgstr "Schlüsserwörter für die Datei %s:\n"
-#: src/main/extractor.c:674
+#: src/main/extractor.c:676
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initialisierung des Plugin-Mechanismus' ist fehlgeschlagen: %s.\n"
diff --git a/po/fr.po b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor-0.5.20a\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2013-12-22 17:50+0100\n"
+"POT-Creation-Date: 2013-12-22 23:11+0100\n"
"PO-Revision-Date: 2008-08-24 19:08+0100\n"
"Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -141,7 +141,7 @@ msgstr "%% fichier BiBTeX\n"
msgid "Keywords for file %s:\n"
msgstr "Mots-clés pour le fichier %s:\n"
-#: src/main/extractor.c:674
+#: src/main/extractor.c:676
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Echec de l'initialisation du module %s !\n"
diff --git a/po/ga.po b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.20\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2013-12-22 17:50+0100\n"
+"POT-Creation-Date: 2013-12-22 23:11+0100\n"
"PO-Revision-Date: 2008-03-21 20:46-0700\n"
"Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -139,7 +139,7 @@ msgstr "%% Comhad BiBTeX\n"
msgid "Keywords for file %s:\n"
msgstr "Lorgfhocail do chomhad %s:\n"
-#: src/main/extractor.c:674
+#: src/main/extractor.c:676
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Theip ar ths meicnocht na mbreisen: %s!\n"
diff --git a/po/it.po b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor-0.6.0\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2013-12-22 17:50+0100\n"
+"POT-Creation-Date: 2013-12-22 23:11+0100\n"
"PO-Revision-Date: 2010-09-30 23:41+0200\n"
"Last-Translator: Sergio Zanchetta <primes2h@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -136,7 +136,7 @@ msgstr "%% file BiBTeX\n"
msgid "Keywords for file %s:\n"
msgstr ""
-#: src/main/extractor.c:674
+#: src/main/extractor.c:676
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr ""
diff --git a/po/libextractor.pot b/po/libextractor.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2013-12-22 17:50+0100\n"
+"POT-Creation-Date: 2013-12-22 23:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -131,7 +131,7 @@ msgstr ""
msgid "Keywords for file %s:\n"
msgstr ""
-#: src/main/extractor.c:674
+#: src/main/extractor.c:676
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor-1.0.0-pre1\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2013-12-22 17:50+0100\n"
+"POT-Creation-Date: 2013-12-22 23:11+0100\n"
"PO-Revision-Date: 2013-08-21 22:41+0200\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -143,7 +143,7 @@ msgstr "%% BiBTeX-bestand\n"
msgid "Keywords for file %s:\n"
msgstr "Trefwoorden voor bestand %s:\n"
-#: src/main/extractor.c:674
+#: src/main/extractor.c:676
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initialisatie van plugin-mechanisme is mislukt: %s\n"
diff --git a/po/pl.po b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 1.0.0-pre1\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2013-12-22 17:50+0100\n"
+"POT-Creation-Date: 2013-12-22 23:11+0100\n"
"PO-Revision-Date: 2012-12-01 15:45+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -138,7 +138,7 @@ msgstr "%% plik BiBTeX\n"
msgid "Keywords for file %s:\n"
msgstr "Słowa kluczowe dla pliku %s:\n"
-#: src/main/extractor.c:674
+#: src/main/extractor.c:676
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Inicjalizacja mechanizmu wtyczek nie powiodła się: %s!\n"
diff --git a/po/ro.po b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.3\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2013-12-22 17:50+0100\n"
+"POT-Creation-Date: 2013-12-22 23:11+0100\n"
"PO-Revision-Date: 2005-08-16 12:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -142,7 +142,7 @@ msgstr "%% BiBTeX file\n"
msgid "Keywords for file %s:\n"
msgstr "Cuvinte cheie pentru fiier %s:\n"
-#: src/main/extractor.c:674
+#: src/main/extractor.c:676
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "iniializare mecanismului de plugin a euat: %s!\n"
diff --git a/po/rw.po b/po/rw.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.4.2\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2013-12-22 17:50+0100\n"
+"POT-Creation-Date: 2013-12-22 23:11+0100\n"
"PO-Revision-Date: 2005-04-04 10:55-0700\n"
"Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -149,7 +149,7 @@ msgstr ""
msgid "Keywords for file %s:\n"
msgstr "kugirango IDOSIYE"
-#: src/main/extractor.c:674
+#: src/main/extractor.c:676
#, fuzzy, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Bya Byanze"
diff --git a/po/sv.po b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.22\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2013-12-22 17:50+0100\n"
+"POT-Creation-Date: 2013-12-22 23:11+0100\n"
"PO-Revision-Date: 2009-05-12 17:45+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -136,7 +136,7 @@ msgstr "%% BiBTeX-fil\n"
msgid "Keywords for file %s:\n"
msgstr "Nyckelord för filen %s:\n"
-#: src/main/extractor.c:674
+#: src/main/extractor.c:676
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
diff --git a/po/uk.po b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 1.0.0-pre1\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2013-12-22 17:50+0100\n"
+"POT-Creation-Date: 2013-12-22 23:11+0100\n"
"PO-Revision-Date: 2012-09-05 22:36+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -151,7 +151,7 @@ msgstr "%% файл BiBTeX\n"
msgid "Keywords for file %s:\n"
msgstr "Ключові слова для файла %s:\n"
-#: src/main/extractor.c:674
+#: src/main/extractor.c:676
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Помилка під час спроби ініціалізації механізму додатків: %s!\n"
diff --git a/po/vi.po b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.6.0\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2013-12-22 17:50+0100\n"
+"POT-Creation-Date: 2013-12-22 23:11+0100\n"
"PO-Revision-Date: 2010-02-11 00:13+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -145,7 +145,7 @@ msgstr "%% tập tin BiBTeX\n"
msgid "Keywords for file %s:\n"
msgstr "Từ khoá cho tập tin %s:\n"
-#: src/main/extractor.c:674
+#: src/main/extractor.c:676
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Việc khởi động cơ chế cầm phít bị lỗi: %s\n"
diff --git a/src/plugins/previewopus_extractor.c b/src/plugins/previewopus_extractor.c
@@ -296,7 +296,7 @@ static void init_packet(AVPacket *packet)
/** Initialize one audio frame for reading from the input file */
static int init_input_frame(AVFrame **frame)
{
- if (!(*frame = av_frame_alloc())) {
+ if (!(*frame = avcodec_alloc_frame())) {
#if DEBUG
fprintf(stderr, "Could not allocate input frame\n");
#endif
@@ -655,7 +655,7 @@ cleanup:
av_freep(&converted_input_samples[0]);
free(converted_input_samples);
}
- av_frame_free(&input_frame);
+ avcodec_free_frame(&input_frame);
return ret;
}
@@ -671,7 +671,7 @@ static int init_output_frame(AVFrame **frame,
int error;
/** Create a new frame to store the audio samples. */
- if (!(*frame = av_frame_alloc())) {
+ if (!(*frame = avcodec_alloc_frame())) {
#if DEBUG
fprintf(stderr, "Could not allocate output frame\n");
#endif
@@ -702,7 +702,7 @@ static int init_output_frame(AVFrame **frame,
#if DEBUG
fprintf(stderr, "Could allocate output frame samples (error '%s')\n", get_error_text(error));
#endif
- av_frame_free(frame);
+ avcodec_free_frame(frame);
return error;
}
@@ -783,17 +783,17 @@ static int load_encode_and_write(AVAudioFifo *fifo,
#if DEBUG
fprintf(stderr, "Could not read data from FIFO\n");
#endif
- av_frame_free(&output_frame);
+ avcodec_free_frame(&output_frame);
return AVERROR_EXIT;
}
/** Encode one frame worth of audio samples. */
if (encode_audio_frame(output_frame, output_format_context,
output_codec_context, &data_written)) {
- av_frame_free(&output_frame);
+ avcodec_free_frame(&output_frame);
return AVERROR_EXIT;
}
- av_frame_free(&output_frame);
+ avcodec_free_frame(&output_frame);
return 0;
}
/** Write the trailer of the output file container. */
