mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
ffmpeg: update to ffmpeg-2.8.4
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue
parent
ab2f94e5c1
commit
085f3c830a
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="ffmpeg"
|
||||
PKG_VERSION="2.8.3"
|
||||
PKG_VERSION="2.8.4"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPLv2.1+"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 0e110e0dba8a22ea481fa5615ebcef6c15a96463 Mon Sep 17 00:00:00 2001
|
||||
From 4c6d7f4453d42f496e0cd7b1bce0e09b26e51a3d Mon Sep 17 00:00:00 2001
|
||||
From: Joakim Plate <elupus@ecce.se>
|
||||
Date: Sun, 11 Sep 2011 19:04:51 +0200
|
||||
Subject: [PATCH 01/13] Support raw dvdsub palette as stored on normal dvd's
|
||||
Subject: [PATCH 01/12] Support raw dvdsub palette as stored on normal dvd's
|
||||
|
||||
This is how the palette is stored on dvd's. Currently
|
||||
only xbmc passes the palette information to libavcodec
|
||||
@ -11,7 +11,7 @@ this way.
|
||||
1 file changed, 24 insertions(+)
|
||||
|
||||
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
|
||||
index 7120f10..4440f00 100644
|
||||
index f009824..bbee694 100644
|
||||
--- a/libavcodec/dvdsubdec.c
|
||||
+++ b/libavcodec/dvdsubdec.c
|
||||
@@ -64,6 +64,24 @@ static void yuv_a_to_rgba(const uint8_t *ycbcr, const uint8_t *alpha, uint32_t *
|
||||
@ -53,10 +53,10 @@ index 7120f10..4440f00 100644
|
||||
int i;
|
||||
av_log(avctx, AV_LOG_DEBUG, "palette:");
|
||||
|
||||
From 748abb8aa4837e3e6808d75c508dbc233ce5e9df Mon Sep 17 00:00:00 2001
|
||||
From 0a21618cb6032b4edd1ddda590d74e271c8cec7a Mon Sep 17 00:00:00 2001
|
||||
From: Cory Fields <theuni-nospam-@xbmc.org>
|
||||
Date: Mon, 28 Jun 2010 01:55:31 -0400
|
||||
Subject: [PATCH 02/13] if av_read_packet returns AVERROR_IO, we are done.
|
||||
Subject: [PATCH 02/12] if av_read_packet returns AVERROR_IO, we are done.
|
||||
ffmpeg's codecs might or might not handle returning any completed demuxed
|
||||
packets correctly
|
||||
|
||||
@ -65,7 +65,7 @@ Subject: [PATCH 02/13] if av_read_packet returns AVERROR_IO, we are done.
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/libavformat/utils.c b/libavformat/utils.c
|
||||
index e67147c..88c51fd 100644
|
||||
index 30567fa..8a947d6 100644
|
||||
--- a/libavformat/utils.c
|
||||
+++ b/libavformat/utils.c
|
||||
@@ -1329,6 +1329,8 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
|
||||
@ -78,10 +78,10 @@ index e67147c..88c51fd 100644
|
||||
for (i = 0; i < s->nb_streams; i++) {
|
||||
st = s->streams[i];
|
||||
|
||||
From 0b8ae9da4f78a4681dee2a6a3f3deeef059d1eac Mon Sep 17 00:00:00 2001
|
||||
From f8de6ce32d69a45062fc5e54043ec6b91fa6adbb Mon Sep 17 00:00:00 2001
|
||||
From: Cory Fields <theuni-nospam-@xbmc.org>
|
||||
Date: Mon, 28 Jun 2010 02:10:50 -0400
|
||||
Subject: [PATCH 03/13] added: Ticket #7187, TV Teletext support for DVB EBU
|
||||
Subject: [PATCH 03/12] added: Ticket #7187, TV Teletext support for DVB EBU
|
||||
Teletext streams
|
||||
|
||||
---
|
||||
@ -118,10 +118,10 @@ index 65824dd..338861e 100644
|
||||
};
|
||||
|
||||
|
||||
From 173b882438900514f8c2793f2bc49cd6722cbd6a Mon Sep 17 00:00:00 2001
|
||||
From 10d84196fb53f52845a1fc9cc06ad124c5e6e6ac Mon Sep 17 00:00:00 2001
|
||||
From: Joakim Plate <elupus@ecce.se>
|
||||
Date: Sun, 18 Sep 2011 19:16:34 +0200
|
||||
Subject: [PATCH 04/13] Don't accept mpegts PMT that isn't current
|
||||
Subject: [PATCH 04/12] Don't accept mpegts PMT that isn't current
|
||||
|
||||
---
|
||||
libavformat/mpegts.c | 4 ++++
|
||||
@ -157,10 +157,10 @@ index 338861e..d4168c8 100644
|
||||
if (skip_identical(h, tssf))
|
||||
return;
|
||||
|
||||
From 3abc23ee058c91b24b1fb81303dcee508a1de49d Mon Sep 17 00:00:00 2001
|
||||
From 1627596f91c4d6e4feeb24c580152d51ee0d0d8d Mon Sep 17 00:00:00 2001
|
||||
From: Joakim Plate <elupus@ecce.se>
|
||||
Date: Sun, 18 Sep 2011 19:17:23 +0200
|
||||
Subject: [PATCH 05/13] Don't reparse PMT unless it's version has changed
|
||||
Subject: [PATCH 05/12] Don't reparse PMT unless it's version has changed
|
||||
|
||||
---
|
||||
libavformat/mpegts.c | 6 ++++++
|
||||
@ -198,10 +198,10 @@ index d4168c8..9c6f6dc 100644
|
||||
if (skip_identical(h, tssf))
|
||||
return;
|
||||
|
||||
From ed09c6ad8d86980207dd0ea56fdfb79e227adbb6 Mon Sep 17 00:00:00 2001
|
||||
From 9fca314d18494367d27f05b324c2a2b12b1fd6af Mon Sep 17 00:00:00 2001
|
||||
From: Cory Fields <theuni-nospam-@xbmc.org>
|
||||
Date: Fri, 9 Jul 2010 16:43:31 -0400
|
||||
Subject: [PATCH 06/13] Read PID timestamps as well as PCR timestamps to find
|
||||
Subject: [PATCH 06/12] Read PID timestamps as well as PCR timestamps to find
|
||||
location in mpegts stream
|
||||
|
||||
---
|
||||
@ -296,22 +296,22 @@ index 9c6f6dc..a4db558 100644
|
||||
.priv_class = &mpegtsraw_class,
|
||||
};
|
||||
|
||||
From ce8186048f2ac760582c6860cfb176bd4d427f98 Mon Sep 17 00:00:00 2001
|
||||
From 3f8c85bbaf307fb2094222aef4d0193c0da879b1 Mon Sep 17 00:00:00 2001
|
||||
From: Joakim Plate <elupus@ecce.se>
|
||||
Date: Sat, 22 Oct 2011 19:01:38 +0200
|
||||
Subject: [PATCH 07/13] Get stream durations using read_timestamp
|
||||
Subject: [PATCH 07/12] Get stream durations using read_timestamp
|
||||
|
||||
---
|
||||
libavformat/utils.c | 39 +++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 39 insertions(+)
|
||||
|
||||
diff --git a/libavformat/utils.c b/libavformat/utils.c
|
||||
index 88c51fd..966f4d2 100644
|
||||
index 8a947d6..88786f1 100644
|
||||
--- a/libavformat/utils.c
|
||||
+++ b/libavformat/utils.c
|
||||
@@ -2455,6 +2455,41 @@ static void estimate_timings_from_bit_rate(AVFormatContext *ic)
|
||||
#define DURATION_MAX_READ_SIZE 250000LL
|
||||
#define DURATION_MAX_RETRY 4
|
||||
#define DURATION_MAX_RETRY 6
|
||||
|
||||
+static void av_estimate_timings_from_pts2(AVFormatContext *ic, int64_t old_offset)
|
||||
+{
|
||||
@ -363,10 +363,10 @@ index 88c51fd..966f4d2 100644
|
||||
/* less precise: use bitrate info */
|
||||
estimate_timings_from_bit_rate(ic);
|
||||
|
||||
From b9cb8fe46a30ba867c6f50ac228f3c25762be73b Mon Sep 17 00:00:00 2001
|
||||
From 45ec6878603e913b45095f792ec55eabbe7b6e87 Mon Sep 17 00:00:00 2001
|
||||
From: Joakim Plate <elupus@ecce.se>
|
||||
Date: Wed, 8 Dec 2010 14:03:43 +0000
|
||||
Subject: [PATCH 08/13] changed: allow 4 second skew between streams in mov
|
||||
Subject: [PATCH 08/12] changed: allow 4 second skew between streams in mov
|
||||
before attempting to seek
|
||||
|
||||
---
|
||||
@ -374,10 +374,10 @@ Subject: [PATCH 08/13] changed: allow 4 second skew between streams in mov
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libavformat/mov.c b/libavformat/mov.c
|
||||
index 735e956..d4e0748 100644
|
||||
index 4ce4e2d..2c364ac 100644
|
||||
--- a/libavformat/mov.c
|
||||
+++ b/libavformat/mov.c
|
||||
@@ -4611,8 +4611,8 @@ static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st)
|
||||
@@ -4624,8 +4624,8 @@ static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st)
|
||||
if (!sample || (!s->pb->seekable && current_sample->pos < sample->pos) ||
|
||||
(s->pb->seekable &&
|
||||
((msc->pb != s->pb && dts < best_dts) || (msc->pb == s->pb &&
|
||||
@ -389,10 +389,10 @@ index 735e956..d4e0748 100644
|
||||
best_dts = dts;
|
||||
*st = avst;
|
||||
|
||||
From feea0da005cea0e0b2580f17395e394d81e1c427 Mon Sep 17 00:00:00 2001
|
||||
From 6ae7fa749997f7ae28d47766ea1a06a6a9b5f6f5 Mon Sep 17 00:00:00 2001
|
||||
From: Joakim Plate <elupus@ecce.se>
|
||||
Date: Fri, 26 Nov 2010 20:56:48 +0000
|
||||
Subject: [PATCH 09/13] fixed: memleak in mpegts demuxer on some malformed (??)
|
||||
Subject: [PATCH 09/12] fixed: memleak in mpegts demuxer on some malformed (??)
|
||||
mpegts files with too large pes packets
|
||||
|
||||
at-visions sample file brokenStream.mpg
|
||||
@ -425,10 +425,10 @@ index a4db558..492d9c7 100644
|
||||
if (ret < 0) {
|
||||
av_free_packet(ts->pkt);
|
||||
|
||||
From b86ed91dab824a9d2bd137662a810e1c4c5a1367 Mon Sep 17 00:00:00 2001
|
||||
From c6c873a20cbba84df564296520c21146df60c752 Mon Sep 17 00:00:00 2001
|
||||
From: Joakim Plate <elupus@ecce.se>
|
||||
Date: Mon, 28 Jun 2010 21:26:54 +0000
|
||||
Subject: [PATCH 10/13] Speed up mpegts av_find_stream_info
|
||||
Subject: [PATCH 10/12] Speed up mpegts av_find_stream_info
|
||||
|
||||
---
|
||||
libavformat/mpegts.c | 2 +-
|
||||
@ -448,10 +448,10 @@ index 492d9c7..29d58eb 100644
|
||||
goto skip;
|
||||
|
||||
|
||||
From 37ab1b368a42dcce9acc229689e063a866df90cb Mon Sep 17 00:00:00 2001
|
||||
From d544c91209bd7738d59ee41e99d7f9d5856f81db Mon Sep 17 00:00:00 2001
|
||||
From: marc <mhocking@ubuntu-desktop.(none)>
|
||||
Date: Mon, 18 Feb 2013 17:18:18 +0000
|
||||
Subject: [PATCH 11/13] dxva-h264 Fix dxva playback of streams that don't start
|
||||
Subject: [PATCH 11/12] dxva-h264 Fix dxva playback of streams that don't start
|
||||
with an I-Frame (adjusted to 2.7)
|
||||
|
||||
---
|
||||
@ -506,7 +506,7 @@ index 7356288..907ee5e 100644
|
||||
int sei_buffering_period_present; ///< Buffering period SEI flag
|
||||
int initial_cpb_removal_delay[32]; ///< Initial timestamps for CPBs
|
||||
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
|
||||
index 9642dc5..cd9b73a 100644
|
||||
index 8be803b7..939d02b 100644
|
||||
--- a/libavcodec/h264_slice.c
|
||||
+++ b/libavcodec/h264_slice.c
|
||||
@@ -1043,6 +1043,7 @@ static int h264_slice_header_init(H264Context *h)
|
||||
@ -518,10 +518,10 @@ index 9642dc5..cd9b73a 100644
|
||||
init_scan_tables(h);
|
||||
ret = ff_h264_alloc_tables(h);
|
||||
|
||||
From 20ee469d2beb6a2963f53adc780eb7e3c2adcdfb Mon Sep 17 00:00:00 2001
|
||||
From 3118c6442bbe8a39de08492a47191476c77a1187 Mon Sep 17 00:00:00 2001
|
||||
From: wsnipex <wsnipex@a1.net>
|
||||
Date: Mon, 16 Feb 2015 09:58:28 +0100
|
||||
Subject: [PATCH 12/13] only check for a git rev if the src tree is in a git
|
||||
Subject: [PATCH 12/12] only check for a git rev if the src tree is in a git
|
||||
repo
|
||||
|
||||
fixes the version string when building from the kodi depends src tree
|
||||
@ -583,31 +583,3 @@ index f9754eb..cc23f80 100755
|
||||
fi
|
||||
|
||||
# no revision number found
|
||||
|
||||
From 24687d508d112358b515ce927b5e16b0369dab2f Mon Sep 17 00:00:00 2001
|
||||
From: Rainer Hochecker <fernetmenta@online.de>
|
||||
Date: Sun, 15 Nov 2015 13:58:50 +0100
|
||||
Subject: [PATCH 13/13] avformat/utils: estimate_timings_from_pts - increase
|
||||
retry counter, fixes invalid duration for ts files with hevc codec
|
||||
|
||||
Fixes a mpegts file with hevc that fails estimating duration. Increasing number of
|
||||
retries fixes the issue.
|
||||
|
||||
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
||||
---
|
||||
libavformat/utils.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libavformat/utils.c b/libavformat/utils.c
|
||||
index 966f4d2..3f26633 100644
|
||||
--- a/libavformat/utils.c
|
||||
+++ b/libavformat/utils.c
|
||||
@@ -2453,7 +2453,7 @@ static void estimate_timings_from_bit_rate(AVFormatContext *ic)
|
||||
}
|
||||
|
||||
#define DURATION_MAX_READ_SIZE 250000LL
|
||||
-#define DURATION_MAX_RETRY 4
|
||||
+#define DURATION_MAX_RETRY 6
|
||||
|
||||
static void av_estimate_timings_from_pts2(AVFormatContext *ic, int64_t old_offset)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user