SHA256
1
0
forked from pool/ffmpeg-4

Accepting request 762871 from home:namtrac:branches:multimedia:libs

- Add 929e5159bc13da374b83f5627879c607acce180b.patch to fix
  bad ID3v2 tag length.

OBS-URL: https://build.opensuse.org/request/show/762871
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=98
This commit is contained in:
Jan Engelhardt 2020-01-10 15:26:55 +00:00 committed by Git OBS Bridge
parent b604963f31
commit 20784330f6
6 changed files with 63 additions and 23 deletions

View File

@ -0,0 +1,32 @@
From 929e5159bc13da374b83f5627879c607acce180b Mon Sep 17 00:00:00 2001
From: Gilles Bouthenot <misc@atomas.com>
Date: Wed, 8 Jan 2020 19:47:55 +0100
Subject: [PATCH] avformat/id3v2enc: fix bad ID3v2 tag length
---
libavformat/id3v2enc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: ffmpeg-4.2.1/libavformat/id3v2enc.c
===================================================================
--- ffmpeg-4.2.1.orig/libavformat/id3v2enc.c
+++ ffmpeg-4.2.1/libavformat/id3v2enc.c
@@ -268,15 +268,15 @@ static int write_ctoc(AVFormatContext *s
if ((ret = avio_open_dyn_buf(&dyn_bc)) < 0)
goto fail;
- id3->len += avio_put_str(dyn_bc, "toc");
+ avio_put_str(dyn_bc, "toc");
avio_w8(dyn_bc, 0x03);
avio_w8(dyn_bc, s->nb_chapters);
for (int i = 0; i < s->nb_chapters; i++) {
snprintf(name, 122, "ch%d", i);
- id3->len += avio_put_str(dyn_bc, name);
+ avio_put_str(dyn_bc, name);
}
len = avio_close_dyn_buf(dyn_bc, &dyn_buf);
- id3->len += 16 + ID3v2_HEADER_SIZE;
+ id3->len += len + ID3v2_HEADER_SIZE;
avio_wb32(s->pb, MKBETAG('C', 'T', 'O', 'C'));
avio_wb32(s->pb, len);

View File

@ -1,7 +1,7 @@
Index: ffmpeg-4.2/configure
Index: ffmpeg-4.2.1/configure
===================================================================
--- ffmpeg-4.2.orig/configure
+++ ffmpeg-4.2/configure
--- ffmpeg-4.2.1.orig/configure
+++ ffmpeg-4.2.1/configure
@@ -232,6 +232,7 @@ External library support:
--enable-libdc1394 enable IIDC-1394 grabbing using libdc1394
and libraw1394 [no]
@ -26,10 +26,10 @@ Index: ffmpeg-4.2/configure
flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs
enabled fontconfig && enable libfontconfig
Index: ffmpeg-4.2/libavcodec/dlopen.h
Index: ffmpeg-4.2.1/libavcodec/dlopen.h
===================================================================
--- /dev/null
+++ ffmpeg-4.2/libavcodec/dlopen.h
+++ ffmpeg-4.2.1/libavcodec/dlopen.h
@@ -0,0 +1,12 @@
+#ifndef LOCALINC_DLOPEN_H
+#define LOCALINC_DLOPEN_H
@ -43,10 +43,10 @@ Index: ffmpeg-4.2/libavcodec/dlopen.h
+ goto error;
+
+#endif
Index: ffmpeg-4.2/libavcodec/libfdk-aacdec.c
Index: ffmpeg-4.2.1/libavcodec/libfdk-aacdec.c
===================================================================
--- ffmpeg-4.2.orig/libavcodec/libfdk-aacdec.c
+++ ffmpeg-4.2/libavcodec/libfdk-aacdec.c
--- ffmpeg-4.2.1.orig/libavcodec/libfdk-aacdec.c
+++ ffmpeg-4.2.1/libavcodec/libfdk-aacdec.c
@@ -37,6 +37,54 @@
#define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS
#endif
@ -114,10 +114,10 @@ Index: ffmpeg-4.2/libavcodec/libfdk-aacdec.c
s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1);
if (!s->handle) {
av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n");
Index: ffmpeg-4.2/libavcodec/libfdk-aacenc.c
Index: ffmpeg-4.2.1/libavcodec/libfdk-aacenc.c
===================================================================
--- ffmpeg-4.2.orig/libavcodec/libfdk-aacenc.c
+++ ffmpeg-4.2/libavcodec/libfdk-aacenc.c
--- ffmpeg-4.2.1.orig/libavcodec/libfdk-aacenc.c
+++ ffmpeg-4.2.1/libavcodec/libfdk-aacenc.c
@@ -34,6 +34,48 @@
#define FDKENC_VER_AT_LEAST(vl0, vl1) 0
#endif

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 10 15:00:38 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
- Add 929e5159bc13da374b83f5627879c607acce180b.patch to fix
bad ID3v2 tag length.
-------------------------------------------------------------------
Mon Dec 30 17:39:01 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package ffmpeg-4
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -102,7 +102,7 @@ Release: 0
Summary: Library for working with various multimedia formats
License: LGPL-2.1-or-later AND GPL-2.0-or-later
Group: Productivity/Multimedia/Video/Editors and Convertors
Url: https://ffmpeg.org/
URL: https://ffmpeg.org/
#Freshcode-URL: http://freshcode.club/projects/ffmpeg
#Git-Clone: git://source.ffmpeg.org/ffmpeg
@ -122,6 +122,7 @@ Patch6: ffmpeg-4.2-dlopen-fdk_aac.patch
# https://trac.ffmpeg.org/ticket/7861
Patch7: ffmpeg4_swscale_replace_illegal_vector_keyword.patch
Patch8: ffmpeg4_swscale_fix_altivec_vsx_recent_gcc.patch
Patch9: 929e5159bc13da374b83f5627879c607acce180b.patch
BuildRequires: ladspa-devel
BuildRequires: libgsm-devel
BuildRequires: libmp3lame-devel

View File

@ -1,6 +1,8 @@
--- ffmpeg/libavcodec/allcodecs.c 2019-03-18 20:18:37.438255620 +0100
+++ ffmpeg-patched/libavcodec/allcodecs.c 2019-03-18 21:35:10.699559247 +0100
@@ -675,13 +675,13 @@
Index: ffmpeg-4.2.1/libavcodec/allcodecs.c
===================================================================
--- ffmpeg-4.2.1.orig/libavcodec/allcodecs.c
+++ ffmpeg-4.2.1/libavcodec/allcodecs.c
@@ -679,13 +679,13 @@ extern AVCodec ff_pcm_mulaw_at_encoder;
extern AVCodec ff_pcm_mulaw_at_decoder;
extern AVCodec ff_qdmc_at_decoder;
extern AVCodec ff_qdm2_at_decoder;
@ -15,4 +17,3 @@
extern AVCodec ff_libdavs2_decoder;
extern AVCodec ff_libfdk_aac_encoder;
extern AVCodec ff_libfdk_aac_decoder;

View File

@ -27,10 +27,10 @@ Signed-off-by: Daniel Kolesa <daniel at octaforge.org>
libswscale/ppc/swscale_vsx.c | 882 +++++++++++++++++++--------------------
2 files changed, 459 insertions(+), 459 deletions(-)
Index: ffmpeg-4.2/libswscale/ppc/swscale_altivec.c
Index: ffmpeg-4.2.1/libswscale/ppc/swscale_altivec.c
===================================================================
--- ffmpeg-4.2.orig/libswscale/ppc/swscale_altivec.c
+++ ffmpeg-4.2/libswscale/ppc/swscale_altivec.c
--- ffmpeg-4.2.1.orig/libswscale/ppc/swscale_altivec.c
+++ ffmpeg-4.2.1/libswscale/ppc/swscale_altivec.c
@@ -153,13 +153,13 @@ static void yuv2plane1_float_altivec(con
const int add = (1 << (shift - 1));
const int clip = (1 << 16) - 1;
@ -88,10 +88,10 @@ Index: ffmpeg-4.2/libswscale/ppc/swscale_altivec.c
vec_st(vd, 0, (float *) &dest[i]);
}
Index: ffmpeg-4.2/libswscale/ppc/swscale_vsx.c
Index: ffmpeg-4.2.1/libswscale/ppc/swscale_vsx.c
===================================================================
--- ffmpeg-4.2.orig/libswscale/ppc/swscale_vsx.c
+++ ffmpeg-4.2/libswscale/ppc/swscale_vsx.c
--- ffmpeg-4.2.1.orig/libswscale/ppc/swscale_vsx.c
+++ ffmpeg-4.2.1/libswscale/ppc/swscale_vsx.c
@@ -103,9 +103,9 @@ static void yuv2plane1_8_vsx(const int16
const int dst_u = -(uintptr_t)dest & 15;
int i, j;