xbmc: update to xbmc-74fa128

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-04-13 20:00:38 +02:00
parent bd389f07e7
commit a1947d131d
6 changed files with 2264 additions and 871 deletions

View File

@ -21,7 +21,7 @@
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="12.1.4"
if [ "$XBMC" = "master" ]; then
PKG_VERSION="17411f2"
PKG_VERSION="74fa128"
fi
PKG_REV="1"
PKG_ARCH="any"

View File

@ -21,7 +21,7 @@
PKG_NAME="xbmc"
PKG_VERSION="12.1.4"
if [ "$XBMC" = "master" ]; then
PKG_VERSION="17411f2"
PKG_VERSION="74fa128"
fi
PKG_REV="1"
PKG_ARCH="any"

View File

@ -0,0 +1,45 @@
From 2280026c33ad6334e0b03b0eee1e35e8de4c5921 Mon Sep 17 00:00:00 2001
From: vicbitter <xbmcvb@gmail.com>
Date: Fri, 12 Apr 2013 11:06:45 +0100
Subject: [PATCH] ffmpeg 1.2 - rollback ff_read_frame_flush to
av_read_frame_flush for external ffmpeg
---
lib/DllAvFormat.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/DllAvFormat.h b/lib/DllAvFormat.h
index 7fc831e..7937421 100644
--- a/lib/DllAvFormat.h
+++ b/lib/DllAvFormat.h
@@ -43,8 +43,7 @@ extern "C" {
#include <ffmpeg/avformat.h>
#endif
/* av_read_frame_flush() is defined for us in lib/xbmc-dll-symbols/DllAvFormat.c */
- // void av_read_frame_flush(AVFormatContext *s); // av_read_frame_flush decrepated
- void ff_read_frame_flush(AVFormatContext *s); // internal replacement
+ void av_read_frame_flush(AVFormatContext *s);
#else
#include "libavformat/avformat.h"
void ff_read_frame_flush(AVFormatContext *s); // internal replacement
@@ -46,7 +46,7 @@ extern "C" {
void av_read_frame_flush(AVFormatContext *s);
#else
#include "libavformat/avformat.h"
- void ff_read_frame_flush(AVFormatContext *s); // internal replacement
+ void av_read_frame_flush(AVFormatContext *s);
#endif
}
@@ -117,7 +117,7 @@ public:
virtual AVInputFormat *av_find_input_format(const char *short_name) { return ::av_find_input_format(short_name); }
virtual void avformat_close_input(AVFormatContext **s) { ::avformat_close_input(s); }
virtual int av_read_frame(AVFormatContext *s, AVPacket *pkt) { return ::av_read_frame(s, pkt); }
- virtual void av_read_frame_flush(AVFormatContext *s) { ::ff_read_frame_flush(s); } // av_read_frame_flush decrepated
+ virtual void av_read_frame_flush(AVFormatContext *s) { ::av_read_frame_flush(s); }
virtual int av_read_play(AVFormatContext *s) { return ::av_read_play(s); }
virtual int av_read_pause(AVFormatContext *s) { return ::av_read_pause(s); }
virtual int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { return ::av_seek_frame(s, stream_index, timestamp, flags); }
--
1.7.10.4