summaryrefslogtreecommitdiff
path: root/multimedia/fuppes/patches/patch-ad
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/fuppes/patches/patch-ad')
-rw-r--r--multimedia/fuppes/patches/patch-ad26
1 files changed, 6 insertions, 20 deletions
diff --git a/multimedia/fuppes/patches/patch-ad b/multimedia/fuppes/patches/patch-ad
index f24c156a42f..08b8b8b3d42 100644
--- a/multimedia/fuppes/patches/patch-ad
+++ b/multimedia/fuppes/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2009/11/28 18:37:22 kefren Exp $
---- src/plugins/ffmpeg/ffmpeg.cpp.orig 2009-11-28 18:48:32.000000000 +0200
-+++ src/plugins/ffmpeg/ffmpeg.cpp 2009-11-28 19:04:32.000000000 +0200
+$NetBSD: patch-ad,v 1.2 2009/11/28 19:31:29 kefren Exp $
+--- src/plugins/ffmpeg/ffmpeg.cpp.orig 2009-07-18 16:08:59.000000000 +0300
++++ src/plugins/ffmpeg/ffmpeg.cpp 2009-11-28 21:00:33.000000000 +0200
@@ -201,7 +201,7 @@
if(pFFmpeg->audio_sync_method){
@@ -40,21 +40,7 @@ $NetBSD: patch-ad,v 1.1 2009/11/28 18:37:22 kefren Exp $
AVPacket pkt;
av_init_packet(&pkt);
-@@ -1020,11 +1020,11 @@
- /* XXX: allocate the subtitles in the codec ? */
- if (subtitle_to_free) {
- if (subtitle_to_free->rects != NULL) {
-- for (i = 0; i < subtitle_to_free->num_rects; i++) {
-+/* for (i = 0; i < subtitle_to_free->num_rects; i++) {
- av_free(subtitle_to_free->rects[i].bitmap);
- av_free(subtitle_to_free->rects[i].rgba_palette);
- }
-- av_freep(&subtitle_to_free->rects);
-+*/ av_freep(&subtitle_to_free->rects);
- }
- subtitle_to_free->num_rects = 0;
- subtitle_to_free = NULL;
-@@ -1054,13 +1054,13 @@
+@@ -1065,13 +1065,13 @@
switch(ost->st->codec->codec_type) {
case CODEC_TYPE_AUDIO:
@@ -70,7 +56,7 @@ $NetBSD: patch-ad,v 1.1 2009/11/28 18:37:22 kefren Exp $
ret = avcodec_encode_audio(enc, pFFmpeg->bit_buffer, pFFmpeg->bit_buffer_size, samples);
}
enc->frame_size = fs_tmp;
-@@ -1309,7 +1309,7 @@
+@@ -1320,7 +1320,7 @@
} else {
switch(codec->codec_type) {
case CODEC_TYPE_AUDIO:
@@ -79,7 +65,7 @@ $NetBSD: patch-ad,v 1.1 2009/11/28 18:37:22 kefren Exp $
goto fail;
if (codec->channels == icodec->channels &&
-@@ -1766,7 +1766,7 @@
+@@ -1777,7 +1777,7 @@
fclose(ost->logfile);
ost->logfile = NULL;
}