mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-28 12:41:05 +00:00
patches/videoparsers: h264parser: refresh patches
In order to avoid the creation of .orig files and break the distcheck target. Signed-off-by: Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com> https://bugzilla.gnome.org/show_bug.cgi?id=754845
This commit is contained in:
parent
2aaafe96b7
commit
ac43e1c596
2 changed files with 11 additions and 11 deletions
|
@ -1,7 +1,7 @@
|
||||||
From a0cdb5443b5ae3176b217a08fb5107e77eea4113 Mon Sep 17 00:00:00 2001
|
From e412ece68af9b1a4ce7309774b38ec548a2d709f Mon Sep 17 00:00:00 2001
|
||||||
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
|
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
|
||||||
Date: Mon, 28 Apr 2014 17:44:03 +0200
|
Date: Mon, 28 Apr 2014 17:44:03 +0200
|
||||||
Subject: [PATCH 1/3] plugins: compile the built-in video parsers as
|
Subject: [PATCH 1/6] plugins: compile the built-in video parsers as
|
||||||
"vaapiparse" element.
|
"vaapiparse" element.
|
||||||
|
|
||||||
The built-in video parsers elements are built into a single DSO named
|
The built-in video parsers elements are built into a single DSO named
|
||||||
|
@ -12,7 +12,7 @@ vaapiparse_CODEC.
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
|
diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
|
||||||
index 76f7686..9d588e2 100644
|
index 915c2d7..96901e0 100644
|
||||||
--- a/gst/vaapi/gsth264parse.c
|
--- a/gst/vaapi/gsth264parse.c
|
||||||
+++ b/gst/vaapi/gsth264parse.c
|
+++ b/gst/vaapi/gsth264parse.c
|
||||||
@@ -26,6 +26,7 @@
|
@@ -26,6 +26,7 @@
|
||||||
|
@ -23,7 +23,7 @@ index 76f7686..9d588e2 100644
|
||||||
#include <gst/base/base.h>
|
#include <gst/base/base.h>
|
||||||
#include <gst/pbutils/pbutils.h>
|
#include <gst/pbutils/pbutils.h>
|
||||||
#include <gst/video/video.h>
|
#include <gst/video/video.h>
|
||||||
@@ -120,7 +121,8 @@ gst_h264_parse_class_init (GstH264ParseClass * klass)
|
@@ -122,7 +123,8 @@ gst_h264_parse_class_init (GstH264ParseClass * klass)
|
||||||
GstBaseParseClass *parse_class = GST_BASE_PARSE_CLASS (klass);
|
GstBaseParseClass *parse_class = GST_BASE_PARSE_CLASS (klass);
|
||||||
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
|
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
|
||||||
|
|
||||||
|
@ -34,5 +34,5 @@ index 76f7686..9d588e2 100644
|
||||||
gobject_class->finalize = gst_h264_parse_finalize;
|
gobject_class->finalize = gst_h264_parse_finalize;
|
||||||
gobject_class->set_property = gst_h264_parse_set_property;
|
gobject_class->set_property = gst_h264_parse_set_property;
|
||||||
--
|
--
|
||||||
2.1.4
|
2.5.1
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 652357e0da6528b0ff8a8e01782c84c032c9f342 Mon Sep 17 00:00:00 2001
|
From 56df8be6dff017d32218bb3111e6ae6ff1316dec Mon Sep 17 00:00:00 2001
|
||||||
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
|
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
|
||||||
Date: Tue, 26 May 2015 09:33:57 +0300
|
Date: Tue, 26 May 2015 09:33:57 +0300
|
||||||
Subject: [PATCH 3/3] h264parse: default to byte-stream/nalu format (Annex B).
|
Subject: [PATCH 3/6] h264parse: default to byte-stream/nalu format (Annex B).
|
||||||
|
|
||||||
Always default to stream-format=byte-stream,alignment=nalu if avcC
|
Always default to stream-format=byte-stream,alignment=nalu if avcC
|
||||||
format was not detected. This is the natural stream format specified
|
format was not detected. This is the natural stream format specified
|
||||||
|
@ -17,10 +17,10 @@ Signed-off-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
|
||||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
|
diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
|
||||||
index 4060145..b5d2955 100644
|
index f472a5e..f1ed269 100644
|
||||||
--- a/gst/vaapi/gsth264parse.c
|
--- a/gst/vaapi/gsth264parse.c
|
||||||
+++ b/gst/vaapi/gsth264parse.c
|
+++ b/gst/vaapi/gsth264parse.c
|
||||||
@@ -392,7 +392,8 @@ gst_h264_parse_negotiate (GstH264Parse * h264parse, gint in_format,
|
@@ -405,7 +405,8 @@ gst_h264_parse_negotiate (GstH264Parse * h264parse, gint in_format,
|
||||||
if (!format)
|
if (!format)
|
||||||
format = GST_H264_PARSE_FORMAT_BYTE;
|
format = GST_H264_PARSE_FORMAT_BYTE;
|
||||||
if (!align)
|
if (!align)
|
||||||
|
@ -30,7 +30,7 @@ index 4060145..b5d2955 100644
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (h264parse, "selected format %s, alignment %s",
|
GST_DEBUG_OBJECT (h264parse, "selected format %s, alignment %s",
|
||||||
gst_h264_parse_get_string (h264parse, TRUE, format),
|
gst_h264_parse_get_string (h264parse, TRUE, format),
|
||||||
@@ -2264,6 +2265,8 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
|
@@ -2452,6 +2453,8 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
|
||||||
|
|
||||||
/* bytestream caps sanity checks */
|
/* bytestream caps sanity checks */
|
||||||
if (format == GST_H264_PARSE_FORMAT_BYTE) {
|
if (format == GST_H264_PARSE_FORMAT_BYTE) {
|
||||||
|
@ -40,5 +40,5 @@ index 4060145..b5d2955 100644
|
||||||
if (codec_data_value != NULL)
|
if (codec_data_value != NULL)
|
||||||
goto bytestream_caps_with_codec_data;
|
goto bytestream_caps_with_codec_data;
|
||||||
--
|
--
|
||||||
2.1.4
|
2.5.1
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue