diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2017-01-10 15:45:26 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2017-01-10 16:03:30 +0000 |
| commit | 95c842a860bef721390d9209411109fe6dff69cc (patch) | |
| tree | 89ef45a3de753a51e22c75ea47e5efd1bb7b14b8 | |
| parent | e81e029aa2720b548092f58a933b705fa7cc7a4e (diff) | |
| download | gstreamer-plugins-bad-95c842a860bef721390d9209411109fe6dff69cc.tar.gz | |
codecparsers: remove problematic 'extern inline'
'extern inline' was added in 2fb76c89 for MSVC (it was just
'inline' before), but all of this doesn't really make sense,
the functions are not going to be inlined anyway, and what
'extern inline' means exactly also appears to depend on the
Cxx standard targetted. Let's just remove the 'extern inline'
entirely. At least gcc6 still emits the exact same code as
before anyway. Fixes compilation/linking with gcc 4.8 as
used on L4T on the TK1.
| -rw-r--r-- | gst-libs/gst/codecparsers/nalutils.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gst-libs/gst/codecparsers/nalutils.c b/gst-libs/gst/codecparsers/nalutils.c index 045b91b1a..d73e26e6f 100644 --- a/gst-libs/gst/codecparsers/nalutils.c +++ b/gst-libs/gst/codecparsers/nalutils.c @@ -77,7 +77,7 @@ nal_reader_init (NalReader * nr, const guint8 * data, guint size) nr->cache = 0xff; } -extern inline gboolean +gboolean nal_reader_read (NalReader * nr, guint nbits) { if (G_UNLIKELY (nr->byte * 8 + (nbits - nr->bits_in_cache) > nr->size * 8)) { @@ -115,7 +115,7 @@ nal_reader_read (NalReader * nr, guint nbits) /* Skips the specified amount of bits. This is only suitable to a cacheable number of bits */ -extern inline gboolean +gboolean nal_reader_skip (NalReader * nr, guint nbits) { g_assert (nbits <= 8 * sizeof (nr->cache)); @@ -146,19 +146,19 @@ nal_reader_skip_long (NalReader * nr, guint nbits) return TRUE; } -extern inline guint +guint nal_reader_get_pos (const NalReader * nr) { return nr->byte * 8 - nr->bits_in_cache; } -extern inline guint +guint nal_reader_get_remaining (const NalReader * nr) { return (nr->size - nr->byte) * 8 + nr->bits_in_cache; } -extern inline guint +guint nal_reader_get_epb_count (const NalReader * nr) { return nr->n_epb; @@ -230,7 +230,7 @@ nal_reader_get_ue (NalReader * nr, guint32 * val) return TRUE; } -extern inline gboolean +gboolean nal_reader_get_se (NalReader * nr, gint32 * val) { guint32 value; @@ -297,7 +297,7 @@ nal_reader_has_more_data (NalReader * nr) /*********** end of nal parser ***************/ -extern inline gint +gint scan_for_start_codes (const guint8 * data, guint size) { GstByteReader br; |