jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

Browse Source
This commit is contained in:
Stephan Raue 2012-08-09 22:26:52 +02:00
commit b5303667e1
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0031-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/libavformat/matroska.c 2012-07-07 03:11:59.514972002 -0700
+++ b/libavformat/matroska.c 2012-07-07 03:12:49.054969249 -0700
@@ -59,6 +59,7 @@
{"S_ASS" , CODEC_ID_SSA},
{"S_SSA" , CODEC_ID_SSA},
{"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE},
+ {"S_DVBSUB" , CODEC_ID_DVB_SUBTITLE},
{"S_HDMV/PGS" , CODEC_ID_HDMV_PGS_SUBTITLE},
{"V_DIRAC" , CODEC_ID_DIRAC},

13
packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/libavutil/utils.c b/libavutil/utils.c
index 971b48b..b57078e 100644
--- a/libavutil/utils.c
+++ b/libavutil/utils.c
@@ -28,7 +28,7 @@
unsigned avutil_version(void)
{
- av_assert0(PIX_FMT_VDA_VLD == 81); //check if the pix fmt enum has not had anything inserted or removed by mistake
+ av_assert0(PIX_FMT_VDA_VLD == 82); //check if the pix fmt enum has not had anything inserted or removed by mistake
av_assert0(AV_SAMPLE_FMT_DBLP == 9);
av_assert0(AVMEDIA_TYPE_ATTACHMENT == 4);
av_assert0(AV_PICTURE_TYPE_BI == 7);

1
packages/sysutils/upower/build
View File

@ -34,6 +34,7 @@ intltoolize --force
--disable-static \
--enable-shared \
--with-backend=linux \
--disable-systemd \
--disable-man-pages \
--disable-gtk-doc \
--enable-gtk-doc-html \