mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-05 07:40:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

patches/videoparsers: rebase all the h264parse patches

Browse source 
In order to avoid the creation of .orig files and break the distcheck target
This commit is contained in:
Víctor Manuel Jáquez Leal 2015-06-04 19:03:44 +02:00
parent d0a1636fa8
commit d8764aa11b
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
patches/videoparsers/0001-plugins-compile-the-built-in-video-parsers-as-vaapip.patch
View file

@ -1,4 +1,4 @@
From c2531548cad46c80b665e7d78b2a0a0d63a083a9 Mon Sep 17 00:00:00 2001
From a0cdb5443b5ae3176b217a08fb5107e77eea4113 Mon Sep 17 00:00:00 2001
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Date: Mon, 28 Apr 2014 17:44:03 +0200
Subject: [PATCH 1/3] plugins: compile the built-in video parsers as
@ -12,7 +12,7 @@ vaapiparse_CODEC.
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
index 3473ca8..078ca83 100644
index 76f7686..9d588e2 100644
--- a/gst/vaapi/gsth264parse.c
+++ b/gst/vaapi/gsth264parse.c
@@ -26,6 +26,7 @@
@ -23,7 +23,7 @@ index 3473ca8..078ca83 100644
#include <gst/base/base.h>
#include <gst/pbutils/pbutils.h>
#include <gst/video/video.h>
@@ -121,7 +122,8 @@ gst_h264_parse_class_init (GstH264ParseClass * klass)
@@ -120,7 +121,8 @@ gst_h264_parse_class_init (GstH264ParseClass * klass)
GstBaseParseClass *parse_class = GST_BASE_PARSE_CLASS (klass);
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);

6
patches/videoparsers/0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch
View file

@ -1,4 +1,4 @@
From df5b8e09df21d96aaace4376318d5790d7c51cdc Mon Sep 17 00:00:00 2001
From cfc25cf07e6547c9b9b6bd0ee7e337df0ba842d2 Mon Sep 17 00:00:00 2001
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Date: Mon, 28 Apr 2014 17:17:04 +0200
Subject: [PATCH 2/3] h264parse: fix build with older GStreamer 1.x stacks.
@ -9,7 +9,7 @@ Subject: [PATCH 2/3] h264parse: fix build with older GStreamer 1.x stacks.
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
index 078ca83..fceec68 100644
index 9d588e2..4060145 100644
--- a/gst/vaapi/gsth264parse.c
+++ b/gst/vaapi/gsth264parse.c
@@ -27,7 +27,7 @@
@ -21,7 +21,7 @@ index 078ca83..fceec68 100644
#include <gst/pbutils/pbutils.h>
#include <gst/video/video.h>
#include "gsth264parse.h"
@@ -164,7 +164,9 @@ gst_h264_parse_init (GstH264Parse * h264parse)
@@ -163,7 +163,9 @@ gst_h264_parse_init (GstH264Parse * h264parse)
{
h264parse->frame_out = gst_adapter_new ();
gst_base_parse_set_pts_interpolation (GST_BASE_PARSE (h264parse), FALSE);

8
patches/videoparsers/0003-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch
View file

@ -1,4 +1,4 @@
From 7650c8681ecf1304a59e7cc4c0bc9eba4f753ffa Mon Sep 17 00:00:00 2001
From 652357e0da6528b0ff8a8e01782c84c032c9f342 Mon Sep 17 00:00:00 2001
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Date: Tue, 26 May 2015 09:33:57 +0300
Subject: [PATCH 3/3] h264parse: default to byte-stream/nalu format (Annex B).
@ -17,10 +17,10 @@ Signed-off-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
index 76f7686..b28d449 100644
index 4060145..b5d2955 100644
--- a/gst/vaapi/gsth264parse.c
+++ b/gst/vaapi/gsth264parse.c
@@ -388,7 +388,8 @@ gst_h264_parse_negotiate (GstH264Parse * h264parse, gint in_format,
@@ -392,7 +392,8 @@ gst_h264_parse_negotiate (GstH264Parse * h264parse, gint in_format,
if (!format)
format = GST_H264_PARSE_FORMAT_BYTE;
if (!align)
@ -30,7 +30,7 @@ index 76f7686..b28d449 100644
GST_DEBUG_OBJECT (h264parse, "selected format %s, alignment %s",
gst_h264_parse_get_string (h264parse, TRUE, format),
@@ -2260,6 +2261,8 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
@@ -2264,6 +2265,8 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
/* bytestream caps sanity checks */
if (format == GST_H264_PARSE_FORMAT_BYTE) {