h264parse: update patches with upstream

These patches didn't applied cleanly, breaking the `make distcleancheck`
target. Re-sync'ed the patches against the current git's submodule.

3 files changed, 22 insertions, 25 deletions

diff --git a/patches/videoparsers/0001-plugins-compile-the-built-in-video-parsers-as-vaapip.patch b/patches/videoparsers/0001-plugins-compile-the-built-in-video-parsers-as-vaapip.patch
index 978cf313..c82d4652 100644
--- a/patches/videoparsers/0001-plugins-compile-the-built-in-video-parsers-as-vaapip.patch
+++ b/patches/videoparsers/0001-plugins-compile-the-built-in-video-parsers-as-vaapip.patch
@@ -1,4 +1,4 @@
-From c78b4c043dc41f071bdf170ecb001dc1aef8f5f6 Mon Sep 17 00:00:00 2001
+From c2531548cad46c80b665e7d78b2a0a0d63a083a9 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
@@ -8,17 +8,11 @@ The built-in video parsers elements are built into a single DSO named
 libgstvaapi_parse.so. The various video parsers could be accessed as
 vaapiparse_CODEC.
 ---
- configure.ac              |    9 ++++++++
- gst/vaapi/Makefile.am     |   35 ++++++++++++++++++++++++++++++
- gst/vaapi/gsth264parse.c  |    4 +++-
- gst/vaapi/gstvaapiparse.c |   53 +++++++++++++++++++++++++++++++++++++++++++++
- gst/vaapi/gstvaapiparse.h |   36 ++++++++++++++++++++++++++++++
- 5 files changed, 136 insertions(+), 1 deletion(-)
- create mode 100644 gst/vaapi/gstvaapiparse.c
- create mode 100644 gst/vaapi/gstvaapiparse.h
+ gst/vaapi/gsth264parse.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
-index 9105d7f..4246b6e 100644
+index 3473ca8..078ca83 100644
 --- a/gst/vaapi/gsth264parse.c
 +++ b/gst/vaapi/gsth264parse.c
 @@ -26,6 +26,7 @@
@@ -29,7 +23,7 @@ index 9105d7f..4246b6e 100644
  #include <gst/base/base.h>
  #include <gst/pbutils/pbutils.h>
  #include <gst/video/video.h>
-@@ -105,7 +106,8 @@ gst_h264_parse_class_init (GstH264ParseClass * klass)
+@@ -121,7 +122,8 @@ gst_h264_parse_class_init (GstH264ParseClass * klass)
    GstBaseParseClass *parse_class = GST_BASE_PARSE_CLASS (klass);
    GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
  
@@ -39,3 +33,6 @@ index 9105d7f..4246b6e 100644
  
    gobject_class->finalize = gst_h264_parse_finalize;
    gobject_class->set_property = gst_h264_parse_set_property;
+-- 
+2.1.4
+
diff --git a/patches/videoparsers/0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch b/patches/videoparsers/0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch
index 02f17bf1..1635475c 100644
--- a/patches/videoparsers/0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch
+++ b/patches/videoparsers/0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch
@@ -1,15 +1,15 @@
-From 92908c46e7dd90063a613742f285e9c494c90d6f Mon Sep 17 00:00:00 2001
+From df5b8e09df21d96aaace4376318d5790d7c51cdc 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.
 
 ---
- gst/vaapi/gsth264parse.c |    4 +++-
- gst/vaapi/gsth264parse.h |    1 +
+ gst/vaapi/gsth264parse.c | 4 +++-
+ gst/vaapi/gsth264parse.h | 1 +
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
-index 678c7f7..37ce228 100644
+index 078ca83..fceec68 100644
 --- a/gst/vaapi/gsth264parse.c
 +++ b/gst/vaapi/gsth264parse.c
 @@ -27,7 +27,7 @@
@@ -21,7 +21,7 @@ index 678c7f7..37ce228 100644
  #include <gst/pbutils/pbutils.h>
  #include <gst/video/video.h>
  #include "gsth264parse.h"
-@@ -148,7 +148,9 @@ gst_h264_parse_init (GstH264Parse * h264parse)
+@@ -164,7 +164,9 @@ gst_h264_parse_init (GstH264Parse * h264parse)
  {
    h264parse->frame_out = gst_adapter_new ();
    gst_base_parse_set_pts_interpolation (GST_BASE_PARSE (h264parse), FALSE);
@@ -32,7 +32,7 @@ index 678c7f7..37ce228 100644
  
  
 diff --git a/gst/vaapi/gsth264parse.h b/gst/vaapi/gsth264parse.h
-index 4c3fdd4..3db8f21 100644
+index e056ca2..56d2612 100644
 --- a/gst/vaapi/gsth264parse.h
 +++ b/gst/vaapi/gsth264parse.h
 @@ -27,6 +27,7 @@
@@ -44,5 +44,5 @@ index 4c3fdd4..3db8f21 100644
  
  G_BEGIN_DECLS
 -- 
-1.7.9.5
+2.1.4
 
diff --git a/patches/videoparsers/0004-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch b/patches/videoparsers/0004-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch
index c86b3c9c..a1d23609 100644
--- a/patches/videoparsers/0004-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch
+++ b/patches/videoparsers/0004-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch
@@ -1,7 +1,7 @@
-From 3885faab12f7bbcc862a3da191161bf91b0b8bd9 Mon Sep 17 00:00:00 2001
+From 134793f35f1a219c79b32b2d23df73ceff0b5e32 Mon Sep 17 00:00:00 2001
 From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
 Date: Tue, 24 Jun 2014 17:27:12 +0200
-Subject: [PATCH 4/8] h264parse: default to byte-stream/nalu format (Annex B).
+Subject: [PATCH 3/3] h264parse: default to byte-stream/nalu format (Annex B).
 
 Always default to stream-format=byte-stream,alignment=nalu if avcC
 format was not detected. This is the natural stream format specified
@@ -12,14 +12,14 @@ https://bugzilla.gnome.org/show_bug.cgi?id=732167
 
 Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
 ---
- gst/vaapi/gsth264parse.c |    5 +++--
+ gst/vaapi/gsth264parse.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
-index 7a88a07..4800c2b 100644
+index fceec68..f15b1b0 100644
 --- a/gst/vaapi/gsth264parse.c
 +++ b/gst/vaapi/gsth264parse.c
-@@ -367,7 +367,8 @@ gst_h264_parse_negotiate (GstH264Parse * h264parse, gint in_format,
+@@ -393,7 +393,8 @@ gst_h264_parse_negotiate (GstH264Parse * h264parse, gint in_format,
    if (!format)
      format = GST_H264_PARSE_FORMAT_BYTE;
    if (!align)
@@ -29,7 +29,7 @@ index 7a88a07..4800c2b 100644
  
    GST_DEBUG_OBJECT (h264parse, "selected format %s, alignment %s",
        gst_h264_parse_get_string (h264parse, TRUE, format),
-@@ -1893,7 +1894,7 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
+@@ -2204,7 +2205,7 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
  
      if (format == GST_H264_PARSE_FORMAT_NONE) {
        format = GST_H264_PARSE_FORMAT_BYTE;
@@ -39,5 +39,5 @@ index 7a88a07..4800c2b 100644
    }
  
 -- 
-1.7.9.5
+2.1.4