[rbdoom3bfg] 09/13: Remove unusued patch, applied upstream long ago: 70-ffmpeg_2.9.patch

[Tobias Frost]

This is an automated email from the git hooks/post-receive script.

tobi pushed a commit to branch master
in repository rbdoom3bfg.

commit c1d5e548c75191b1ac9cdc9d9bf93349221d0939
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Sat Oct 15 09:35:39 2016 +0200

    Remove unusued patch, applied upstream long ago: 70-ffmpeg_2.9.patch
---
 debian/changelog                   |  1 +
 debian/patches/70-ffmpeg_2.9.patch | 35 -----------------------------------
 debian/patches/series              |  1 -
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index df8791c..33a1b50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ rbdoom3bfg (1.1.0~preview3+dfsg+git20160807-1) UNRELEASED; urgency=medium
   * Bump S-V -- no changes
   * Change compat level to 10, "--parallel" in d/rules is now default and so
     was dropped.
+  * Deleted (long ago) applied upstream patch 70-ffmpeg_2.9.patch
 
  -- Tobias Frost <tobi at debian.org>  Fri, 14 Oct 2016 21:16:02 +0200
 
diff --git a/debian/patches/70-ffmpeg_2.9.patch b/debian/patches/70-ffmpeg_2.9.patch
deleted file mode 100644
index 09d7e99..0000000
--- a/debian/patches/70-ffmpeg_2.9.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Bug-Debian: https://bugs.debian.org/803857
-Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/issues/249
-Applied-Upstream: Yes, but different solution.
-Last-Update: 2015-11-02
-
---- rbdoom3bfg-1.0.3+repack1+git20150806.orig/neo/renderer/Cinematic.cpp
-+++ rbdoom3bfg-1.0.3+repack1+git20150806/neo/renderer/Cinematic.cpp
-@@ -439,8 +439,8 @@ idCinematicLocal::~idCinematicLocal()
- 	
- 	// RB: TODO double check this. It seems we have different versions of ffmpeg on Kubuntu 13.10 and the win32 development files
- #if defined(_WIN32) || defined(_WIN64)
--	avcodec_free_frame( &frame );
--	avcodec_free_frame( &frame2 );
-+	av_frame_free( &frame );
-+	av_frame_free( &frame2 );
- #else
- 	av_freep( &frame );
- 	av_freep( &frame2 );
-@@ -557,12 +557,12 @@ bool idCinematicLocal::InitFromFFMPEGFil
- 	framePos = -1;
- 	common->Printf( "Loaded FFMPEG file: '%s', looping=%d%dx%d, %f FPS, %f sec\n", qpath, looping, CIN_WIDTH, CIN_HEIGHT, frameRate, durationSec );
- 	image = ( byte* )Mem_Alloc( CIN_WIDTH * CIN_HEIGHT * 4 * 2, TAG_CINEMATIC );
--	avpicture_fill( ( AVPicture* )frame2, image, PIX_FMT_BGR32, CIN_WIDTH, CIN_HEIGHT );
-+	avpicture_fill( ( AVPicture* )frame2, image, AV_PIX_FMT_BGR32, CIN_WIDTH, CIN_HEIGHT );
- 	if( img_convert_ctx )
- 	{
- 		sws_freeContext( img_convert_ctx );
- 	}
--	img_convert_ctx = sws_getContext( dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt, CIN_WIDTH, CIN_HEIGHT, PIX_FMT_BGR32, SWS_BICUBIC, NULL, NULL, NULL );
-+	img_convert_ctx = sws_getContext( dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt, CIN_WIDTH, CIN_HEIGHT, AV_PIX_FMT_BGR32, SWS_BICUBIC, NULL, NULL, NULL );
- 	status = FMV_PLAY;
- 	
- 	startTime = 0;
diff --git a/debian/patches/series b/debian/patches/series
index a31fbf1..847080c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 10-lowercase-executeable.patch
 20-reproducible.patch
 #65-init-sdl2.patch
-#70-ffmpeg_2.9.patch
 80-libpng16.patch
 90-system-rapidjson.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git