← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gstreamer-vaapi/vivid

« back to all changes in this revision

Viewing changes to patches/videoparsers/0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch

  • Committer: Package Import Robot
  • Author(s): Vincent Cheng
  • Date: 2014-08-06 23:56:00 UTC
  • mfrom: (0.1.4 sid) (1.1.3)
  • Revision ID: package-import@ubuntu.com-20140806235600-fg1kcmiu67k315q5
Tags: 0.5.9-2
http://bugs.debian.org/757283
* Remove spurious build-deps: libva-drm1, libavcodec-dev. (Closes: #757283)
* Drop Build-Depends-Indep and build docs unconditionally on all archs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/videoparsers/0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch
 
1
From 92908c46e7dd90063a613742f285e9c494c90d6f Mon Sep 17 00:00:00 2001
 
2
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
 
3
Date: Mon, 28 Apr 2014 17:17:04 +0200
 
4
Subject: [PATCH 2/3] h264parse: fix build with older GStreamer 1.x stacks.
 
5
 
 
6
---
 
7
 gst/vaapi/gsth264parse.c |    4 +++-
 
8
 gst/vaapi/gsth264parse.h |    1 +
 
9
 2 files changed, 4 insertions(+), 1 deletion(-)
 
10
 
 
11
diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
 
12
index 678c7f7..37ce228 100644
 
13
--- a/gst/vaapi/gsth264parse.c
 
14
+++ b/gst/vaapi/gsth264parse.c
 
15
@@ -27,7 +27,7 @@
 
16
 #endif
 
17
 
 
18
 #include "gstvaapiparse.h"
 
19
-#include <gst/base/base.h>
 
20
+#include <gst/base/gstbytewriter.h>
 
21
 #include <gst/pbutils/pbutils.h>
 
22
 #include <gst/video/video.h>
 
23
 #include "gsth264parse.h"
 
24
@@ -148,7 +148,9 @@ gst_h264_parse_init (GstH264Parse * h264parse)
 
25
 {
 
26
   h264parse->frame_out = gst_adapter_new ();
 
27
   gst_base_parse_set_pts_interpolation (GST_BASE_PARSE (h264parse), FALSE);
 
28
+#if GST_CHECK_VERSION(1,3,0)
 
29
   GST_PAD_SET_ACCEPT_INTERSECT (GST_BASE_PARSE_SINK_PAD (h264parse));
 
30
+#endif
 
31
 }
 
32
 
 
33
 
 
34
diff --git a/gst/vaapi/gsth264parse.h b/gst/vaapi/gsth264parse.h
 
35
index 4c3fdd4..3db8f21 100644
 
36
--- a/gst/vaapi/gsth264parse.h
 
37
+++ b/gst/vaapi/gsth264parse.h
 
38
@@ -27,6 +27,7 @@
 
39
 
 
40
 #include <gst/gst.h>
 
41
 #include <gst/base/gstbaseparse.h>
 
42
+#include <gst/base/gstadapter.h>
 
43
 #include <gst/codecparsers/gsth264parser.h>
 
44
 
 
45
 G_BEGIN_DECLS
 
46
-- 
 
47
1.7.9.5
 
48