From 944e34daeb736a4e4ed91fb0ac918af7d2609a12 Mon Sep 17 00:00:00 2001 From: Mikael Lund Jepsen Date: Sat, 7 Jul 2012 09:58:07 -0700 Subject: [PATCH 1/3] Fix playback of DVB subtitles in tvheadend recordings --- ...-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0031-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0031-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0031-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch new file mode 100644 index 0000000000..b780d72a55 --- /dev/null +++ b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0031-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch @@ -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}, From d58f1e154bb89cf5fd2ea38b7db510684635b854 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 9 Aug 2012 19:01:53 +0300 Subject: [PATCH 2/3] ffmpeg: add xvba_fix_pix_fmt_vda_vld_assert.patch this fixes 'Assertion PIX_FMT_VDA_VLD == 81 failed at libavutil/utils.c:31... Aborted' error which is caused by -add_xvba_support.patch --- ...0.4-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch new file mode 100644 index 0000000000..6dd036b6f8 --- /dev/null +++ b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch @@ -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); From d37b22132e0e235152bf0282c5f0ecd02d7b9271 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 11 Aug 2012 13:06:52 +0400 Subject: [PATCH 3/3] disable crystalhd in Virtual project no point in building chd support on Virtual systems that will not have the hardware --- projects/Virtual/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/Virtual/options b/projects/Virtual/options index 9632db3146..51010aa026 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -255,7 +255,7 @@ # Use Broadcom CrystalHD Decoder Card for video acceleration # (needs Kernelsupport for Broadcom Decoder Card and a supported card) - CRYSTALHD="yes" + CRYSTALHD="no" # build and install remote support (yes / no) REMOTE_SUPPORT="yes"