[SCM] chromaprint/master: Removed, no longer needed

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun Feb 7 21:02:19 UTC 2016


The following commit has been merged in the master branch:
commit 924fb0358cb4627bea962b89a0b107ce897c6e18
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Feb 7 21:55:39 2016 +0100

    Removed, no longer needed

diff --git a/debian/patches/remove-deprecated-lavc-APIs.patch b/debian/patches/remove-deprecated-lavc-APIs.patch
deleted file mode 100644
index ef1e5cb..0000000
--- a/debian/patches/remove-deprecated-lavc-APIs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: fpcalc: remove uses of deprecated lavc APIs
-Origin: upstream,
- https://bitbucket.org/acoustid/chromaprint/commits/37092d380a28abcc63fa120499030a0f2b7df80f
-Last-Update: 2015-10-02
-
---- a/examples/fpcalc.c
-+++ b/examples/fpcalc.c
-@@ -17,10 +17,6 @@
- #define MAX(a, b) ((a) > (b) ? (a) : (b))
- #define MIN(a, b) ((a) < (b) ? (a) : (b))
- 
--#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0)
--#define avcodec_free_frame av_freep
--#endif
--
- int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name, int max_length, int *duration)
- {
- 	int ok = 0, remaining, length, consumed, codec_ctx_opened = 0, got_frame, stream_index;
-@@ -131,7 +127,7 @@
- 	remaining = max_length * codec_ctx->channels * codec_ctx->sample_rate;
- 	chromaprint_start(chromaprint_ctx, codec_ctx->sample_rate, codec_ctx->channels);
- 
--	frame = avcodec_alloc_frame();
-+	frame = av_frame_alloc();
- 
- 	while (1) {
- 		if (av_read_frame(format_ctx, &packet) < 0) {
-@@ -139,7 +135,7 @@
- 		}
- 
- 		if (packet.stream_index == stream_index) {
--			avcodec_get_frame_defaults(frame);
-+			av_frame_unref(frame);
- 
- 			got_frame = 0;
- 			consumed = avcodec_decode_audio4(codec_ctx, frame, &got_frame, &packet);
-@@ -196,7 +192,7 @@
- 
- done:
- 	if (frame) {
--		avcodec_free_frame(&frame);
-+		av_frame_free(&frame);
- 	}
- 	if (dst_data[0]) {
- 		av_freep(&dst_data[0]);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index da23020..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-remove-deprecated-lavc-APIs.patch

-- 
packaging for chromaprint, an audio fingerprinting library



More information about the pkg-multimedia-commits mailing list