[renpy] 05/24: Remove ffmpeg patches.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository renpy.

commit 9d03060d46bac380e9846639b4794838fa99027d
Author: Markus Koschany <apo at debian.org>
Date:   Mon Jan 25 19:06:09 2016 +0100

    Remove ffmpeg patches.
---
 debian/patches/Replace-removed-macros.patch | 19 -------
 debian/patches/ffmpeg_2.9.patch             | 84 -----------------------------
 2 files changed, 103 deletions(-)

diff --git a/debian/patches/Replace-removed-macros.patch b/debian/patches/Replace-removed-macros.patch
deleted file mode 100644
index 0d41c1d..0000000
--- a/debian/patches/Replace-removed-macros.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Replace removed macros
- Replace AVCODEC_MAX_AUDIO_FRAME_SIZE with its previous value 192000.
-
-Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Last-Update: <2014-04-25>
-
---- renpy-6.16.5.orig/module/ffdecode.c
-+++ renpy-6.16.5/module/ffdecode.c
-@@ -101,8 +101,8 @@ typedef struct VideoState {
-        compensation */
- 
- #ifndef HAS_RESAMPLE
--    uint8_t audio_buf1[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ;
--    uint8_t audio_buf2[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ;
-+    uint8_t audio_buf1[(192000 * 3) / 2] __attribute__ ((aligned (16))) ;
-+    uint8_t audio_buf2[(192000 * 3) / 2] __attribute__ ((aligned (16))) ;
- #else
-     uint8_t *audio_buf1;
- #endif
diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
deleted file mode 100644
index 92086bc..0000000
--- a/debian/patches/ffmpeg_2.9.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Last-Update: <2015-11-02>
-
---- renpy-6.17.6.orig/module/ffdecode.c
-+++ renpy-6.17.6/module/ffdecode.c
-@@ -23,6 +23,7 @@
- #include <math.h>
- #include <limits.h>
- #include <libavutil/avstring.h>
-+#include <libavutil/time.h>
- #include <libavformat/avformat.h>
- #include <libavcodec/avcodec.h>
- #include <libswscale/swscale.h>
-@@ -565,7 +566,7 @@ static int video_refresh(void *opaque)
- 			video_display(is);
- 		}
- 
--		av_free(vp->frame);
-+		av_frame_free(&vp->frame);
- 		vp->frame = NULL;
- 
- 		is->first_frame = 0;
-@@ -619,13 +620,13 @@ static void alloc_picture(void *opaque,
- 
-     pixel = SDL_MapRGBA(surf->format, 1, 2, 3, 4);
-     if (bytes[0] == 4 && bytes[1] == 1) {
--        vp->fmt = PIX_FMT_ARGB;
-+        vp->fmt = AV_PIX_FMT_ARGB;
-     } else if (bytes[0] == 4 && bytes[1] == 3) {
--        vp->fmt = PIX_FMT_ABGR;
-+        vp->fmt = AV_PIX_FMT_ABGR;
-     } else if (bytes[0] == 1) {
--        vp->fmt = PIX_FMT_RGBA;
-+        vp->fmt = AV_PIX_FMT_RGBA;
-     } else {
--        vp->fmt = PIX_FMT_BGRA;
-+        vp->fmt = AV_PIX_FMT_BGRA;
-     }
- 
-     pixel = SDL_MapRGBA(surf->format, 0, 0, 0, 255);
-@@ -748,7 +749,7 @@ static int video_thread(void *arg)
-     double pts;
- 
-     for(;;) {
--        frame = avcodec_alloc_frame();
-+        frame = av_frame_alloc();
- 
-         while (is->paused && !is->videoq.abort_request) {
-             SDL_Delay(2);
-@@ -808,10 +809,10 @@ static int audio_decode_frame(VideoState
-             int resample_changed, audio_resample;
- 
-             if (!is->frame) {
--                if (!(is->frame = avcodec_alloc_frame()))
-+                if (!(is->frame = av_frame_alloc()))
-                     return AVERROR(ENOMEM);
-             } else
--                avcodec_get_frame_defaults(is->frame);
-+                av_frame_unref(is->frame);
- 
-             if (flush_complete)
-                 break;
-@@ -1223,9 +1224,9 @@ static int stream_component_open(VideoSt
-     /* prepare audio output */
-     if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
-         if (enc->channels > 0) {
--            enc->request_channels = FFMIN(2, enc->channels);
-+            enc->request_channel_layout = av_get_default_channel_layout(FFMIN(2, enc->channels));
-         } else {
--            enc->request_channels = 2;
-+            enc->request_channel_layout = av_get_default_channel_layout(2);
-         }
-     }
- 
-@@ -1625,7 +1626,7 @@ void ffpy_stream_close(VideoState *is)
-     for(i=0; i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
-         vp = &is->pictq[i];
-         if (vp->frame) {
--            av_free(vp->frame);
-+            av_frame_free(&vp->frame);
-         }
-     }
-     

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