mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

video: fix return type of _get_palette() and add since markers to docs

Browse source 
'const gpointer' is not the same as 'gconstpointer', see
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35928.
This commit is contained in:
Tim-Philipp Müller 2013-02-06 12:36:19 +00:00
parent ed6e7776f3
commit dce49a1a7e
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst-libs/gst/video/video-format.c
View file

@ -1032,7 +1032,7 @@ unpack_RGB8P (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
} }
} }
static guint32 std_palette_RGB8P[] = { static const guint32 std_palette_RGB8P[] = {
0xff000000, 0xff000033, 0xff000066, 0xff000099, 0xff0000cc, 0xff0000ff, 0xff000000, 0xff000033, 0xff000066, 0xff000099, 0xff0000cc, 0xff0000ff,
0xff003300, 0xff003333, 0xff003366, 0xff003399, 0xff0033cc, 0xff0033ff, 0xff003300, 0xff003333, 0xff003366, 0xff003399, 0xff0033cc, 0xff0033ff,
0xff006600, 0xff006633, 0xff006666, 0xff006699, 0xff0066cc, 0xff0066ff, 0xff006600, 0xff006633, 0xff006666, 0xff006699, 0xff0066cc, 0xff0066ff,
@ -2328,8 +2328,10 @@ gst_video_format_get_info (GstVideoFormat format)
* *
* Returns: the default palette of @format or %NULL when @format does not have a * Returns: the default palette of @format or %NULL when @format does not have a
* palette. * palette.
*
* Since: 1.2
*/ */
const gpointer gconstpointer
gst_video_format_get_palette (GstVideoFormat format, gsize * size) gst_video_format_get_palette (GstVideoFormat format, gsize * size)
{ {
g_return_val_if_fail (format < G_N_ELEMENTS (formats), NULL); g_return_val_if_fail (format < G_N_ELEMENTS (formats), NULL);

4
gst-libs/gst/video/video-format.h
View file

@ -231,7 +231,7 @@ typedef enum
* in the least significant bits of the destination. * in the least significant bits of the destination.
* @GST_VIDEO_PACK_FLAG_INTERLACED: The source is interlaced. The unpacked * @GST_VIDEO_PACK_FLAG_INTERLACED: The source is interlaced. The unpacked
* format will be interlaced as well with each line containing * format will be interlaced as well with each line containing
* information from alternating fields. * information from alternating fields. (Since 1.2)
* *
* The different flags that can be used when packing and unpacking. * The different flags that can be used when packing and unpacking.
*/ */
@ -436,7 +436,7 @@ const gchar * gst_video_format_to_string (GstVideoFormat format) G_G
const GstVideoFormatInfo * const GstVideoFormatInfo *
gst_video_format_get_info (GstVideoFormat format) G_GNUC_CONST; gst_video_format_get_info (GstVideoFormat format) G_GNUC_CONST;
const gpointer gst_video_format_get_palette (GstVideoFormat format, gsize *size); gconstpointer gst_video_format_get_palette (GstVideoFormat format, gsize *size);
#define GST_VIDEO_SIZE_RANGE "(int) [ 1, max ]" #define GST_VIDEO_SIZE_RANGE "(int) [ 1, max ]"
#define GST_VIDEO_FPS_RANGE "(fraction) [ 0, max ]" #define GST_VIDEO_FPS_RANGE "(fraction) [ 0, max ]"

2
gst/videoconvert/videoconvert.c
View file

@ -391,7 +391,7 @@ videoconvert_convert_generic (VideoConvert * convert, GstVideoFrame * dest,
int i, j; int i, j;
gint width, height; gint width, height;
guint in_bits, out_bits; guint in_bits, out_bits;
gpointer pal; gconstpointer pal;
gsize palsize; gsize palsize;
height = convert->height; height = convert->height;

2
gst/videotestsrc/gstvideotestsrc.c
View file

@ -817,7 +817,7 @@ gst_video_test_src_fill (GstPushSrc * psrc, GstBuffer * buffer)
GstVideoTestSrc *src; GstVideoTestSrc *src;
GstClockTime next_time; GstClockTime next_time;
GstVideoFrame frame; GstVideoFrame frame;
gpointer pal; gconstpointer pal;
gsize palsize; gsize palsize;
src = GST_VIDEO_TEST_SRC (psrc); src = GST_VIDEO_TEST_SRC (psrc);