[vlc-devel] commit: Added a i_original_fourcc field to es_format_t. (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon May 11 19:41:11 2009 +0200| [e481f91027724e63d86391cb65e008359c8a8f97] | committer: Laurent Aimar 

Added a i_original_fourcc field to es_format_t.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e481f91027724e63d86391cb65e008359c8a8f97
---

 include/vlc_es.h     |    6 ++++--
 src/libvlccore.sym   |    2 +-
 src/misc/es_format.c |    1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/vlc_es.h b/include/vlc_es.h
index 8744f20..ecaa843 100644
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -27,6 +27,7 @@
 /* FIXME: i'm not too sure about this include but it fixes compilation of
  * video chromas -- dionoea */
 #include "vlc_common.h"
+#include <vlc_fourcc.h>
 
 /**
  * \file
@@ -227,8 +228,9 @@ typedef struct extra_languages_t
  */
 struct es_format_t
 {
-    int             i_cat;      /**< ES category @see es_format_category_e */
-    vlc_fourcc_t    i_codec;    /**< FOURCC value as used in vlc */
+    int             i_cat;              /**< ES category @see es_format_category_e */
+    vlc_fourcc_t    i_codec;            /**< FOURCC value as used in vlc */
+    vlc_fourcc_t    i_original_fourcc;  /**< original FOURCC from the container */
 
     int             i_id;       /**< es identifier, where means
                                     -1: let the core mark the right id
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index d4b5c80..cc556b6 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -453,7 +453,7 @@ vlc_event_send
 __vlc_execve
 vlc_fastmem_register
 vlc_freeaddrinfo
-vlc_fourcc_GetClass
+vlc_fourcc_GetCodec
 vlc_fourcc_GetDescription
 vlc_gai_strerror
 vlc_gc_init
diff --git a/src/misc/es_format.c b/src/misc/es_format.c
index 9f74db0..6b52137 100644
--- a/src/misc/es_format.c
+++ b/src/misc/es_format.c
@@ -133,6 +133,7 @@ void es_format_Init( es_format_t *fmt,
 {
     fmt->i_cat                  = i_cat;
     fmt->i_codec                = i_codec;
+    fmt->i_original_fourcc      = 0;
     fmt->i_id                   = -1;
     fmt->i_group                = 0;
     fmt->i_priority             = 0;