From 8499a0e35aaeea1dd23c5b15c03caaec78de485a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 17 Dec 2013 17:23:19 +0100 Subject: [PATCH] Revert "video: specify/restrict usage of GST_VIDEO_FORMAT_ENCODED" This reverts commit 5fcdabd907ca45595b64131bbae0ea963e259a7c. Instead of making it impossible to use the ENCODED format we should just document that it must not be used for capsfeature-less caps. Also this commit broke API/ABI. --- gst-libs/gst/video/video-format.h | 2 +- gst-libs/gst/video/video-info.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gst-libs/gst/video/video-format.h b/gst-libs/gst/video/video-format.h index 9ea803f416..f60c380b03 100644 --- a/gst-libs/gst/video/video-format.h +++ b/gst-libs/gst/video/video-format.h @@ -29,7 +29,7 @@ G_BEGIN_DECLS /** * GstVideoFormat: * @GST_VIDEO_FORMAT_UNKNOWN: Unknown or unset video format id - * @GST_VIDEO_FORMAT_ENCODED: Encoded video format (NOTE: not for use in "video/x-raw") + * @GST_VIDEO_FORMAT_ENCODED: Encoded video format * @GST_VIDEO_FORMAT_I420: planar 4:2:0 YUV * @GST_VIDEO_FORMAT_YV12: planar 4:2:0 YVU (like I420 but UV planes swapped) * @GST_VIDEO_FORMAT_YUY2: packed 4:2:2 YUV (Y0-U0-Y1-V0 Y2-U2-Y3-V2 Y4 ...) diff --git a/gst-libs/gst/video/video-info.c b/gst-libs/gst/video/video-info.c index 36f140870e..6db2f664ba 100644 --- a/gst-libs/gst/video/video-info.c +++ b/gst-libs/gst/video/video-info.c @@ -317,7 +317,6 @@ gst_video_info_to_caps (GstVideoInfo * info) g_return_val_if_fail (info != NULL, NULL); g_return_val_if_fail (info->finfo != NULL, NULL); g_return_val_if_fail (info->finfo->format != GST_VIDEO_FORMAT_UNKNOWN, NULL); - g_return_val_if_fail (info->finfo->format != GST_VIDEO_FORMAT_ENCODED, NULL); format = gst_video_format_to_string (info->finfo->format); g_return_val_if_fail (format != NULL, NULL);