[transcode/f25] Redo patch
by Leigh Scott
Summary of changes:
2cc71c4... Redo patch (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 8 months
[transcode/f24] Redo patch
by Leigh Scott
commit 2cc71c49e28c62ad21518caed5571b268328bdc5
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Sep 17 10:24:06 2016 +0100
Redo patch
transcode-1.1.7-ffmpeg29.patch | 66 ++++++++++++++++++++++++++++++++++++++++++
transcode-ffmpeg3.patch | 21 --------------
transcode.spec | 5 +++-
3 files changed, 70 insertions(+), 22 deletions(-)
---
diff --git a/transcode-1.1.7-ffmpeg29.patch b/transcode-1.1.7-ffmpeg29.patch
index 7901fc3..0ad98db 100644
--- a/transcode-1.1.7-ffmpeg29.patch
+++ b/transcode-1.1.7-ffmpeg29.patch
@@ -350,3 +350,69 @@ Index: transcode-1.1.7/import/import_ffmpeg.c
src_fmt = IMG_YUV444P;
YUV_INIT_PLANES(src_planes, frame, src_fmt,
lavc_dec_context->width, lavc_dec_context->height);
+Index: transcode-1.1.7/export/aud_aux.c
+===================================================================
+--- transcode-1.1.7.orig/export/aud_aux.c
++++ transcode-1.1.7/export/aud_aux.c
+@@ -846,6 +846,9 @@ static int tc_audio_encode_ffmpeg(char *
+ #ifdef HAVE_FFMPEG
+ int in_size, out_size;
+ char *in_buf;
++ int got_packet;
++ AVPacket avpkt = { 0 };
++ AVFrame *frame = av_frame_alloc();
+
+ //-- input buffer and amount of bytes --
+ in_size = aud_size;
+@@ -866,10 +869,14 @@ static int tc_audio_encode_ffmpeg(char *
+
+ ac_memcpy(&mpa_buf[mpa_buf_ptr], in_buf, bytes_needed);
+
++ frame->nb_samples = mpa_ctx.frame_size;
++ avcodec_fill_audio_frame(frame, mpa_ctx.channels, mpa_ctx.sample_fmt, (const uint8_t *)mpa_buf, mpa_bytes_pf, 1);
++ avpkt.data = output;
++ avpkt.size = OUTPUT_SIZE;
+ TC_LOCK_LIBAVCODEC;
+- out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output,
+- OUTPUT_SIZE, (short *)mpa_buf);
++ out_size = avcodec_encode_audio2(&mpa_ctx, &avpkt, frame, &got_packet);
+ TC_UNLOCK_LIBAVCODEC;
++ out_size = avpkt.size;
+ tc_audio_write(output, out_size, avifile);
+
+ in_size -= bytes_needed;
+@@ -884,6 +891,7 @@ static int tc_audio_encode_ffmpeg(char *
+
+ ac_memcpy(&mpa_buf[mpa_buf_ptr], aud_buffer, bytes_avail);
+ mpa_buf_ptr += bytes_avail;
++ av_frame_free(&frame);
+ return (0);
+ }
+ } //bytes availabe from last call?
+@@ -893,10 +901,15 @@ static int tc_audio_encode_ffmpeg(char *
+ //----------------------------------------------------
+
+ while (in_size >= mpa_bytes_pf) {
++ av_frame_unref(frame);
++ frame->nb_samples = mpa_ctx.frame_size;
++ avcodec_fill_audio_frame(frame, mpa_ctx.channels, mpa_ctx.sample_fmt, (const uint8_t *)in_buf, mpa_bytes_pf, 1);
++ avpkt.data = output;
++ avpkt.size = OUTPUT_SIZE;
+ TC_LOCK_LIBAVCODEC;
+- out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output,
+- OUTPUT_SIZE, (short *)in_buf);
++ out_size = avcodec_encode_audio2(&mpa_ctx, &avpkt, frame, &got_packet);
+ TC_UNLOCK_LIBAVCODEC;
++ out_size = avpkt.size;
+
+ tc_audio_write(output, out_size, avifile);
+
+@@ -904,6 +917,8 @@ static int tc_audio_encode_ffmpeg(char *
+ in_buf += mpa_bytes_pf;
+ }
+
++ av_frame_free(&frame);
++
+ //-- hold rest of bytes in mpa-buffer --
+ //--------------------------------------
+ if (in_size > 0) {
diff --git a/transcode-ffmpeg3.patch b/transcode-ffmpeg3.patch
index 5b33c14..efc928f 100644
--- a/transcode-ffmpeg3.patch
+++ b/transcode-ffmpeg3.patch
@@ -211,24 +211,3 @@
{"MPG2", ""}},
{0, TC_CODEC_UNKNOWN, NULL, {""}}};
---- a/export/aud_aux.c
-+++ b/export/aud_aux.c
-@@ -867,7 +867,7 @@
- ac_memcpy(&mpa_buf[mpa_buf_ptr], in_buf, bytes_needed);
-
- TC_LOCK_LIBAVCODEC;
-- out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output,
-+ out_size = avcodec_encode_audio2(&mpa_ctx, (unsigned char *)output,
- OUTPUT_SIZE, (short *)mpa_buf);
- TC_UNLOCK_LIBAVCODEC;
- tc_audio_write(output, out_size, avifile);
-@@ -894,7 +894,7 @@
-
- while (in_size >= mpa_bytes_pf) {
- TC_LOCK_LIBAVCODEC;
-- out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output,
-+ out_size = avcodec_encode_audio2(&mpa_ctx, (unsigned char *)output,
- OUTPUT_SIZE, (short *)in_buf);
- TC_UNLOCK_LIBAVCODEC;
-
-
diff --git a/transcode.spec b/transcode.spec
index c8516a5..3168db9 100644
--- a/transcode.spec
+++ b/transcode.spec
@@ -4,7 +4,7 @@
Name: transcode
Version: 1.1.7
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
@@ -176,6 +176,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
+* Sat Sep 17 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.7-17
+- Redo patch
+
* Sat Sep 17 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.7-16
- Add patch
7 years, 8 months
[qtav] Update to 1.11.0-0.5gitbc46ae4
by Martin Gansser
commit 71b53713ef13374c2f53e3ffa7f632890ce38dfe
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Sep 17 11:09:57 2016 +0200
Update to 1.11.0-0.5gitbc46ae4
.gitignore | 1 +
qtav.spec | 17 ++++++++---------
sources | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f1808d..46c47a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/QtAV-c5db90b.tar.gz
+/QtAV-bc46ae4.tar.gz
diff --git a/qtav.spec b/qtav.spec
index f0583b5..a3ca5b0 100644
--- a/qtav.spec
+++ b/qtav.spec
@@ -1,5 +1,5 @@
-# https://github.com/wang-bin/QtAV/commit/c5db90b2ac4724808f738a39796f24a62...
-%global commit0 c5db90b2ac4724808f738a39796f24a627704c31
+# https://github.com/wang-bin/QtAV/commit/bc46ae44ac1406e575f9e694b556a7be2...
+%global commit0 bc46ae44ac1406e575f9e694b556a7be2d55380e
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global project QtAV
@@ -7,7 +7,7 @@
Name: qtav
Version: 1.11.0
-Release: 1.git%{shortcommit0}%{?dist}
+Release: 0.5git%{shortcommit0}%{?dist}
Summary: A media playback framework based on Qt and FFmpeg
License: LGPLv2+ and GPLv3+ and BSD
Group: Development/Libraries
@@ -17,7 +17,6 @@ Source0: https://github.com/wang-bin/QtAV/archive/%{commit0}/%{project}-%
BuildRequires: desktop-file-utils
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtdeclarative-devel
-BuildRequires: qt5-qtquickcontrols
BuildRequires: libass-devel
BuildRequires: ffmpeg-devel
BuildRequires: openal-soft-devel
@@ -134,7 +133,8 @@ mkdir build; pushd build
QMAKE_CFLAGS="%{optflags}" \
QMAKE_CXXFLAGS="%{optflags}" \
QMAKE_LFLAGS="-Wl,--as-needed" \
- CONFIG+="no_rpath recheck config_libass_link no-tests release" ..
+ CONFIG+="no_rpath recheck config_libass_link debug" \
+ ..
%make_build
%install
@@ -222,10 +222,9 @@ fi
%{_datadir}/icons/hicolor/*/apps/QtAV.svg
%changelog
-* Sat Sep 03 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 1.11.0-1.gitc5db90b
-- Disable debug config
-- Fix Release tag (this is a post-stable-release)
-- Add qt5-qtquickcontrols as BR package
+* Sat Sep 17 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 1.11.0-0.5gitbc46ae4
+- Update to 1.11.0-0.5gitbc46ae4
+- Dropped config option no_config_tests
* Fri Sep 02 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 1.11.0-0.4gitc5db90b
- Disabled config test by adding no_config_tests
diff --git a/sources b/sources
index 42e1af2..23d038b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a20f891a15362b3c5cfbad8487638696 QtAV-c5db90b.tar.gz
+69da38f4fcdd4efb5c27e90e7aafd58a QtAV-bc46ae4.tar.gz
7 years, 8 months
[transcode/f24] add lost patch
by Leigh Scott
Summary of changes:
9bdb9e6... add lost patch (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 8 months
[transcode/f25] add lost patch
by Leigh Scott
Summary of changes:
9bdb9e6... add lost patch (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 8 months
[transcode] add lost patch
by Leigh Scott
commit 9bdb9e63eefa10677ca770ffd0f90ba2bdc0eb67
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Sep 17 09:33:12 2016 +0100
add lost patch
transcode-ffmpeg3.patch | 21 +++++++++++++++++++++
transcode.spec | 5 ++++-
2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/transcode-ffmpeg3.patch b/transcode-ffmpeg3.patch
index efc928f..5b33c14 100644
--- a/transcode-ffmpeg3.patch
+++ b/transcode-ffmpeg3.patch
@@ -211,3 +211,24 @@
{"MPG2", ""}},
{0, TC_CODEC_UNKNOWN, NULL, {""}}};
+--- a/export/aud_aux.c
++++ b/export/aud_aux.c
+@@ -867,7 +867,7 @@
+ ac_memcpy(&mpa_buf[mpa_buf_ptr], in_buf, bytes_needed);
+
+ TC_LOCK_LIBAVCODEC;
+- out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output,
++ out_size = avcodec_encode_audio2(&mpa_ctx, (unsigned char *)output,
+ OUTPUT_SIZE, (short *)mpa_buf);
+ TC_UNLOCK_LIBAVCODEC;
+ tc_audio_write(output, out_size, avifile);
+@@ -894,7 +894,7 @@
+
+ while (in_size >= mpa_bytes_pf) {
+ TC_LOCK_LIBAVCODEC;
+- out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output,
++ out_size = avcodec_encode_audio2(&mpa_ctx, (unsigned char *)output,
+ OUTPUT_SIZE, (short *)in_buf);
+ TC_UNLOCK_LIBAVCODEC;
+
+
diff --git a/transcode.spec b/transcode.spec
index be9064e..c8516a5 100644
--- a/transcode.spec
+++ b/transcode.spec
@@ -4,7 +4,7 @@
Name: transcode
Version: 1.1.7
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
@@ -176,6 +176,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
+* Sat Sep 17 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.7-16
+- Add patch
+
* Sat Sep 17 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.7-15
- Patch to rename avcodec_encode_audio to avcodec_encode_audio2 rfbz#4262
7 years, 8 months
[transcode/f24] add bug reference
by Leigh Scott
Summary of changes:
df7fb37... add bug reference (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 8 months
[transcode/f25] add bug reference
by Leigh Scott
Summary of changes:
df7fb37... add bug reference (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 8 months
[transcode] add bug reference
by Leigh Scott
commit df7fb37aae54e28c4a1d8a9edd6ec7c76f34ba27
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Sep 17 09:19:15 2016 +0100
add bug reference
transcode.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/transcode.spec b/transcode.spec
index 4494550..be9064e 100644
--- a/transcode.spec
+++ b/transcode.spec
@@ -177,7 +177,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
* Sat Sep 17 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.7-15
-- Patch to rename avcodec_encode_audio to avcodec_encode_audio2
+- Patch to rename avcodec_encode_audio to avcodec_encode_audio2 rfbz#4262
* Mon Feb 29 2016 Sérgio Basto <sergio(a)serjux.com> - 1.1.7-14
- Add all archlinux/gentoo patches make it compatible with lastest ffmpeg.
7 years, 8 months