Control: tags 803826 + pending Dear maintainer,
I've prepared an NMU for info-beamer (versioned as 1.0~pre3-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- Sebastian Ramacher
diff -Nru info-beamer-1.0~pre3/debian/changelog info-beamer-1.0~pre3/debian/changelog
--- info-beamer-1.0~pre3/debian/changelog 2015-01-16 14:51:17.000000000 +0100
+++ info-beamer-1.0~pre3/debian/changelog 2016-03-06 22:31:10.000000000 +0100
@@ -1,3 +1,12 @@
+info-beamer (1.0~pre3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Andreas Cadhalpun ]
+ * Fix build against ffmpeg 3.0. (Closes: #803826)
+
+ -- Sebastian Ramacher <sramac...@debian.org> Sun, 06 Mar 2016 22:31:09 +0100
+
info-beamer (1.0~pre3-1) unstable; urgency=low
* Initial release (Closes: #712087)
diff -Nru info-beamer-1.0~pre3/debian/patches/ffmpeg_2.9.patch info-beamer-1.0~pre3/debian/patches/ffmpeg_2.9.patch
--- info-beamer-1.0~pre3/debian/patches/ffmpeg_2.9.patch 1970-01-01 01:00:00.000000000 +0100
+++ info-beamer-1.0~pre3/debian/patches/ffmpeg_2.9.patch 2016-03-06 22:30:45.000000000 +0100
@@ -0,0 +1,38 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
+Last-Update: <2015-11-02>
+
+--- info-beamer-1.0~pre3.orig/video.c
++++ info-beamer-1.0~pre3/video.c
+@@ -64,9 +64,9 @@ static void video_free(video_t *video) {
+ if (video->scaler)
+ sws_freeContext(video->scaler);
+ if (video->raw_frame)
+- av_free(video->raw_frame);
++ av_frame_free(&video->raw_frame);
+ if (video->scaled_frame)
+- av_free(video->scaled_frame);
++ av_frame_free(&video->scaled_frame);
+
+ if (video->codec_context)
+ avcodec_close(video->codec_context);
+@@ -78,7 +78,7 @@ static void video_free(video_t *video) {
+
+ static int video_open(video_t *video, const char *filename) {
+ video->finished = 0;
+- video->format = PIX_FMT_RGB24;
++ video->format = AV_PIX_FMT_RGB24;
+
+ if (avformat_open_input(&video->format_context, filename, NULL, NULL) ||
+ avformat_find_stream_info(video->format_context, NULL) < 0) {
+@@ -143,8 +143,8 @@ static int video_open(video_t *video, co
+ fprintf(stderr, INFO("fps: %lf\n"), video->fps);
+
+ /* Get framebuffers */
+- video->raw_frame = avcodec_alloc_frame();
+- video->scaled_frame = avcodec_alloc_frame();
++ video->raw_frame = av_frame_alloc();
++ video->scaled_frame = av_frame_alloc();
+
+ if (!video->raw_frame || !video->scaled_frame) {
+ fprintf(stderr, ERROR("cannot preallocate frames\n"));
diff -Nru info-beamer-1.0~pre3/debian/patches/series info-beamer-1.0~pre3/debian/patches/series
--- info-beamer-1.0~pre3/debian/patches/series 2015-01-16 11:56:40.000000000 +0100
+++ info-beamer-1.0~pre3/debian/patches/series 2016-03-06 22:30:45.000000000 +0100
@@ -0,0 +1 @@
+ffmpeg_2.9.patch
signature.asc
Description: PGP signature
