mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
ffmpeg: update to ffmpeg-0.10.4
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
e92e65dcd5
commit
7d1f399569
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="ffmpeg"
|
||||
PKG_VERSION="0.10.3"
|
||||
PKG_VERSION="0.10.4"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPL"
|
||||
|
@ -1,34 +0,0 @@
|
||||
From 05f8b5549c5e20cf9a417069838edd6841d7bd40 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Niedermayer <michaelni@gmx.at>
|
||||
Date: Sat, 11 Feb 2012 20:14:33 +0100
|
||||
Subject: [PATCH 1/1] threads: Perform the generic progress cleanup more
|
||||
carefully.
|
||||
|
||||
The cleanup is only done now when
|
||||
a picture is returned (assuming that it has to be done when its returned)
|
||||
a error is returned (assuming that there will be no further progress on the frame)
|
||||
the codec is not h264 (this is still needed due to some deadlocks in realvideo)
|
||||
|
||||
This fixes a decoding regression with 00017.MTS
|
||||
|
||||
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
||||
---
|
||||
libavcodec/pthread.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
|
||||
index 6ae763d..c58222b 100644
|
||||
--- a/libavcodec/pthread.c
|
||||
+++ b/libavcodec/pthread.c
|
||||
@@ -390,7 +390,7 @@ static attribute_align_arg void *frame_worker_thread(void *arg)
|
||||
|
||||
pthread_mutex_lock(&p->progress_mutex);
|
||||
for (i = 0; i < MAX_BUFFERS; i++)
|
||||
- if (p->progress_used[i]) {
|
||||
+ if (p->progress_used[i] && (p->got_frame || p->result<0 || avctx->codec_id != CODEC_ID_H264)) {
|
||||
p->progress[i][0] = INT_MAX;
|
||||
p->progress[i][1] = INT_MAX;
|
||||
}
|
||||
--
|
||||
1.7.9.4
|
||||
|
26
packages/multimedia/ffmpeg/patches/rename.sh
Executable file
26
packages/multimedia/ffmpeg/patches/rename.sh
Executable file
@ -0,0 +1,26 @@
|
||||
#!/bin/sh
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv)
|
||||
#
|
||||
# This Program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This Program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with OpenELEC.tv; see the file COPYING. If not, write to
|
||||
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
|
||||
for i in `ls ffmpeg-$1-*.patch`; do
|
||||
mv $i `echo $i | sed "s,$1,$2,g"`
|
||||
done
|
Loading…
x
Reference in New Issue
Block a user