* modules/stream_out/transcode.c: backport of 11350.

[vlc] / include / vlc_es.h

diff --git a/include/vlc_es.h b/include/vlc_es.h
index 8a4f3f78f2627268b5d60f1970897049dd099b0d..e1fe3eef25708dcf98cd31be0abd983f0586774b 100644 (file)
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -99,10 +99,13 @@ struct video_format_t
 
     unsigned int i_bits_per_pixel;             /**< number of bits per pixel */
 
+    unsigned int i_sar_num;                   /**< sample/pixel aspect ratio */
+    unsigned int i_sar_den;
+
     unsigned int i_frame_rate;                     /**< frame rate numerator */
     unsigned int i_frame_rate_base;              /**< frame rate denominator */
 
-    int i_rmask, i_rgmask, i_bmask;          /**< color masks for RGB chroma */
+    int i_rmask, i_gmask, i_bmask;          /**< color masks for RGB chroma */
     video_palette_t *p_palette;              /**< video palette from demuxer */
 };
 
@@ -111,12 +114,23 @@ struct video_format_t
  */
 struct subs_format_t
 {
+    /* the character encoding of the text of the subtitle.
+     * all gettext recognized shorts can be used */
     char *psz_encoding;
 
+
+    int  i_x_origin; /**< x coordinate of the subtitle. 0 = left */
+    int  i_y_origin; /**< y coordinate of the subtitle. 0 = top */
+
     struct
     {
-        /* FIXME */
+        /*  */
         uint32_t palette[16+1];
+
+        /* the width of the original movie the spu was extracted from */
+        int    i_original_frame_width;
+        /* the height of the original movie the spu was extracted from */
+        int    i_original_frame_height;
     } spu;
 
     struct