# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572424 0
# Node ID 8b01cc3eb8d985ea681e0be67d423ff7c8a2fb1a
# Parent  dc3f5eb4e676e488ce53a7fac005f42acf4ab2c9# Parent  e3b7e04384fe0d20b58b46be117de8dcd4ce3ed0
Automatic merge from PDK_3.0.h

diff -r dc3f5eb4e676 -r 8b01cc3eb8d9 videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h
--- a/videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h	Mon Mar 08 21:44:26 2010 +0000
+++ b/videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h	Sun Mar 14 13:13:44 2010 +0000
@@ -15,7 +15,7 @@
 */
 
 
-// Version : %version: 3 %
+// Version : %version: 4 %
 
 
 
@@ -48,6 +48,11 @@
 const TMPXAttributeData KMPXMediaVideoDrmProtected        = { KMPXMediaIdVideo, 0x200 };
 const TMPXAttributeData KMPXMediaVideoPausableStream      = { KMPXMediaIdVideo, 0x400 };
 const TMPXAttributeData KMPXMediaFourCCCode               = { KMPXMediaIdVideo, 0x800 };
+const TMPXAttributeData KMPXMediaVideoDescription         = { KMPXMediaIdVideo, 0x1000 };
+const TMPXAttributeData KMPXMediaVideoLocation            = { KMPXMediaIdVideo, 0x2000 };
+const TMPXAttributeData KMPXMediaVideoCopyright           = { KMPXMediaIdVideo, 0x4000 };
+const TMPXAttributeData KMPXMediaVideoLanguage            = { KMPXMediaIdVideo, 0x8000 };
+const TMPXAttributeData KMPXMediaVideoKeywords            = { KMPXMediaIdVideo, 0x10000 };
 
 const TMPXAttributeData KMPXMediaVideoAll                 = { KMPXMediaIdVideo, 0xffffffff };
 
diff -r dc3f5eb4e676 -r 8b01cc3eb8d9 videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h
--- a/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h	Mon Mar 08 21:44:26 2010 +0000
+++ b/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h	Sun Mar 14 13:13:44 2010 +0000
@@ -15,7 +15,7 @@
 */
 
 
-// Version : %version: ou1cpsw#4 %
+// Version : %version: 6 %
 
 
 #ifndef CMPXVIDEOPLAYBACKDEFS_H
@@ -138,27 +138,28 @@
 //  Content ID identifying video display window category of content provided
 //  in the media object and associated attributes.
 //
-const TInt KMPXMediaIdVideoDisplayMessage = 0x20024333;
+const TInt KMPXMediaIdVideoDisplaySyncMessage = 0x20024333;
 
 //
 //  TInt for Command Id
 //
-const TMPXAttributeData KMPXMediaVideoDisplayCommand = { KMPXMediaIdVideoDisplayMessage, 0x01 };
+const TMPXAttributeData KMPXMediaVideoDisplayCommand = { KMPXMediaIdVideoDisplaySyncMessage, 0x01 };
 
 //
 //  TSurfaceId
 //
-const TMPXAttributeData KMPXMediaVideoDisplayTSurfaceId = { KMPXMediaIdVideoDisplayMessage, 0x02 };
+const TMPXAttributeData KMPXMediaVideoDisplayTSurfaceId = { KMPXMediaIdVideoDisplaySyncMessage, 0x02 };
 
 //
 //  TRect
 //
-const TMPXAttributeData KMPXMediaVideoDisplayCropRect = { KMPXMediaIdVideoDisplayMessage, 0x04 };
+const TMPXAttributeData KMPXMediaVideoDisplayCropRect = { KMPXMediaIdVideoDisplaySyncMessage, 0x04 };
 
 //
 //  TVideoAspectRatio
 //
-const TMPXAttributeData KMPXMediaVideoDisplayAspectRatio = { KMPXMediaIdVideoDisplayMessage, 0x08 };
+const TMPXAttributeData KMPXMediaVideoDisplayAspectRatio = { KMPXMediaIdVideoDisplaySyncMessage, 0x08 };
+
 
 enum TMPXVideoDisplayCommand
 {