From acb3aeebd41f6dd0355595f6ed10f2a0e9dc546e Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Fri, 14 Sep 2012 13:19:45 +0200
Subject: fix caps

---
 docs/design/design-decodebin.txt        | 4 ++--
 docs/design/design-encoding.txt         | 6 +++---
 docs/design/draft-subtitle-overlays.txt | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'docs')

diff --git a/docs/design/design-decodebin.txt b/docs/design/design-decodebin.txt
index 034d1cdd8..ec8df9a5d 100644
--- a/docs/design/design-decodebin.txt
+++ b/docs/design/design-decodebin.txt
@@ -84,9 +84,9 @@ fine-tune the process.
 
   By default the target caps are:
 
-  _ Raw audio : audio/x-raw-int, audio/x-raw-float
+  _ Raw audio : audio/x-raw
 
-  _ and raw video : video/x-raw-rgb, video/x-raw-yuv
+  _ and raw video : video/x-raw
 
   _ and Text : text/plain, text/x-pango-markup
 
diff --git a/docs/design/design-encoding.txt b/docs/design/design-encoding.txt
index 9a4f6b355..b28de89d3 100644
--- a/docs/design/design-encoding.txt
+++ b/docs/design/design-encoding.txt
@@ -107,7 +107,7 @@ B. Goals
    * Uncompressed (but maybe subsampled)
    * Compressed
   * Audio
-   * Uncompressed (audio/x-raw-{int|float})
+   * Uncompressed (audio/x-raw)
    * Compressed
   * Timed text
   * Private streams
@@ -308,7 +308,7 @@ made as to which formatting to use for storing targets and profiles.
       <type>audio</type>
       <format>audio/mpeg,mpegversion=4</format>
       <preset>Quality High/Main</preset>
-      <restriction>audio/x-raw-int,channels=[1,2]</restriction>
+      <restriction>audio/x-raw,channels=[1,2]</restriction>
       <presence>1</presence>
     </stream-profile>
     <stream-profile>
@@ -316,7 +316,7 @@ made as to which formatting to use for storing targets and profiles.
       <format>video/x-h264</format>
       <preset>Profile Baseline/Quality High</preset>
       <restriction>
-        video/x-raw-yuv,width=[16, 800],\
+        video/x-raw,width=[16, 800],\
 	height=[16, 480],framerate=[1/1, 30000/1001]
       </restriction>
       <presence>1</presence>
diff --git a/docs/design/draft-subtitle-overlays.txt b/docs/design/draft-subtitle-overlays.txt
index 4cc894d97..b2e080dde 100644
--- a/docs/design/draft-subtitle-overlays.txt
+++ b/docs/design/draft-subtitle-overlays.txt
@@ -540,9 +540,9 @@ Other considerations:
 TEST: should these look (roughly) alike (note text distortion) - needs fixing in textoverlay
 
 gst-launch-0.10 \
-    videotestsrc ! video/x-raw-yuv,width=640,height=480,pixel-aspect-ratio=1/1 ! textoverlay text=Hello font-desc=72 ! xvimagesink \
-    videotestsrc ! video/x-raw-yuv,width=320,height=480,pixel-aspect-ratio=2/1 ! textoverlay text=Hello font-desc=72 ! xvimagesink \
-    videotestsrc ! video/x-raw-yuv,width=640,height=240,pixel-aspect-ratio=1/2 ! textoverlay text=Hello font-desc=72 ! xvimagesink
+    videotestsrc ! video/x-raw,width=640,height=480,pixel-aspect-ratio=1/1 ! textoverlay text=Hello font-desc=72 ! xvimagesink \
+    videotestsrc ! video/x-raw,width=320,height=480,pixel-aspect-ratio=2/1 ! textoverlay text=Hello font-desc=72 ! xvimagesink \
+    videotestsrc ! video/x-raw,width=640,height=240,pixel-aspect-ratio=1/2 ! textoverlay text=Hello font-desc=72 ! xvimagesink
 
  ~~~ THE END ~~~ 
 
-- 
cgit v1.2.3