package/ffmpeg: bump version to 2.6.1
PATCH v3 1/1 package/ffmpeg: bump version to 2.6.1
Dump two Kodi-specific patches according to
https://github.com/xbmc/xbmc/pull/6636
and update two new patches to improve hevc handling with Kodi Isengard.
Signed-off-by Bernd Kuhls <[email protected]>
---
v3: bumped to 2.6.1
v2: updated hash (Baruch)
package/ffmpeg/0002-asf-hacks.patch | 42 ------- ...add-public-version-of-ff_read_frame_flush.patch | 54 -------- package/ffmpeg/0013-fix-ff-thread-get-format.patch | 131 ++++++++++++++++++++ .../ffmpeg/0014-hevc-avoid-unnecessary-calls.patch | 72 +++++++++++ package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 2 +- 6 files changed, 205 insertions(+), 98 deletions(-) delete mode 100644 package/ffmpeg/0002-asf-hacks.patch delete mode 100644 package/ffmpeg/0013-add-public-version-of-ff_read_frame_flush.patch create mode 100644 package/ffmpeg/0013-fix-ff-thread-get-format.patch create mode 100644 package/ffmpeg/0014-hevc-avoid-unnecessary-calls.patch
package/ffmpeg/0002-asf-hacks.patch deleted +0 -42
@@ -1,42 +0,0 @@ -From fbd0b8b0239d3786b941adc89322b8e49e4c768e Mon Sep 17 00:00:00 2001 -From: Joakim Plate <[email protected]> -Date: Mon, 12 Sep 2011 21:37:17 +0200 -Subject: [PATCH 02/13] asf hacks - -Patch part of the XBMC patch set for ffmpeg, downloaded from -https://github.com/xbmc/FFmpeg/. - -Signed-off-by: Bernd Kuhls <[email protected]> -Signed-off-by: Thomas Petazzoni <[email protected]> ---- - libavformat/asfdec.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c -index 7f7bb4d..8911987 100644 ---- a/libavformat/asfdec.c -+++ b/libavformat/asfdec.c -@@ -1549,9 +1549,20 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, - AVStream *st = s->streams[stream_index]; - int ret = 0; - -+ if (pts == 0) { -+ // this is a hack since av_gen_search searches the entire file in this case -+ av_log(s, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", s->data_offset); -+ if (avio_seek(s->pb, s->data_offset, SEEK_SET) < 0) -+ return -1; -+ return 0; -+ } -+ - if (s->packet_size <= 0) - return -1; - -+ if (st->codec->codec_type != AVMEDIA_TYPE_VIDEO) -+ return -1; -+ - /* Try using the protocol's read_seek if available */ - if (s->pb) { - int ret = avio_seek_time(s->pb, stream_index, pts, flags); --- -2.1.0 -
package/ffmpeg/0013-add-public-version-of-ff_read_frame_flush.patch deleted +0 -54
54 lines not on this page · raw message
package/ffmpeg/0013-fix-ff-thread-get-format.patch new file +131 -0
131 lines not on this page · raw message
package/ffmpeg/0014-hevc-avoid-unnecessary-calls.patch new file +72 -0
72 lines not on this page · raw message
package/ffmpeg/ffmpeg.hash +1 -1
@@ -1,2 +1,2 @@ # Locally calculated -sha256 cc91c166c2b0ad9aacc533e4d5637912df583b43834c68aeec12ded7e082a286 ffmpeg-2.5.4.tar.bz2 +sha256 a4f6388706ee2daba9d35d2aa018ae5feeb450efa716555e011a6543d43ec7c1 ffmpeg-2.6.1.tar.bz2
package/ffmpeg/ffmpeg.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 2.5.4 +FFMPEG_VERSION = 2.6.1 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2 FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES
Signature · 1 line
1.7.10.4
Thomas Petazzoni
AppliedPATCH v3 1/1 package/ffmpeg: bump version to 2.6.1
Dear Bernd Kuhls,
Quoted 5 lines · Bernd Kuhls
Dump two Kodi-specific patches according to
https://github.com/xbmc/xbmc/pull/6636
and update two new patches to improve hevc handling with Kodi Isengard.Signed-off-by Bernd Kuhls <[email protected]>
Applied, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com