<div class="gmail_quote">On Thu, Apr 12, 2012 at 1:41 PM, Sébastien Toque <span dir="ltr"><<a href="mailto:git@videolan.org">git@videolan.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
android | branch: master | Sébastien Toque <<a href="mailto:xilasz@gmail.com">xilasz@gmail.com</a>> | Thu Apr 12 19:27:17 2012 +0200| [5cf9c9b89c1218bb15484b89bf1b7cd35700e9da] | committer: Sébastien Toque<br>
<br>
libvlc_media_track_info_t: Move new fields at the end of the structure<br>
<br>
> <a href="http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=5cf9c9b89c1218bb15484b89bf1b7cd35700e9da" target="_blank">http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=5cf9c9b89c1218bb15484b89bf1b7cd35700e9da</a><br>

---<br>
<br>
 ...language-and-frame-rate-to-libvlc_media_t.patch |   22 ++++++++-----------<br>
 1 files changed, 9 insertions(+), 13 deletions(-)<br>
<br>
diff --git a/patches/0003-libvlc-add-language-and-frame-rate-to-libvlc_media_t.patch b/patches/0003-libvlc-add-language-and-frame-rate-to-libvlc_media_t.patch<br>
index d12f362..e4e4d4c 100644<br>
--- a/patches/0003-libvlc-add-language-and-frame-rate-to-libvlc_media_t.patch<br>
+++ b/patches/0003-libvlc-add-language-and-frame-rate-to-libvlc_media_t.patch<br>
@@ -1,6 +1,6 @@<br>
-From 283011cced8ee43f19747d14f5b257d0b00e5039 Mon Sep 17 00:00:00 2001<br>
+From 52e0e35615298f7589f116c3835f6a67fafe0de1 Mon Sep 17 00:00:00 2001<br>
 From: =?UTF-8?q?S=C3=A9bastien=20Toque?= <<a href="mailto:xilasz@gmail.com">xilasz@gmail.com</a>><br>
-Date: Wed, 11 Apr 2012 21:30:31 +0200<br>
+Date: Thu, 12 Apr 2012 19:22:43 +0200<br>
 Subject: [PATCH 3/3] libvlc: add language and frame rate to<br>
  libvlc_media_track_info_t<br>
<br>
@@ -10,19 +10,10 @@ Subject: [PATCH 3/3] libvlc: add language and frame rate to<br>
  2 files changed, 6 insertions(+), 0 deletions(-)<br>
<br>
 diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h<br>
-index 279a29c..e43a5b4 100644<br>
+index 279a29c..577e363 100644<br>
 --- a/include/vlc/libvlc_media.h<br>
 +++ b/include/vlc/libvlc_media.h<br>
-@@ -150,6 +150,8 @@ typedef struct libvlc_media_track_info_t<br>
-     int         i_id;<br>
-     libvlc_track_type_t i_type;<br>
-<br>
-+    char        *psz_language;<br>
-+<br>
-     /* Codec specific */<br>
-     int         i_profile;<br>
-     int         i_level;<br>
-@@ -164,6 +166,7 @@ typedef struct libvlc_media_track_info_t<br>
+@@ -164,9 +164,12 @@ typedef struct libvlc_media_track_info_t<br>
              /* Video specific */<br>
              unsigned    i_height;<br>
              unsigned    i_width;<br>
@@ -30,6 +21,11 @@ index 279a29c..e43a5b4 100644<br>
          } video;<br>
      } u;<br>
<br>
++    char *psz_language;<br>
++<br>
+ } libvlc_media_track_info_t;<br>
+<br>
+<br>
 diff --git a/lib/media.c b/lib/media.c<br>
 index 2c01c80..4bc832b 100644<br>
 --- a/lib/media.c<br>
<br>
_______________________________________________<br>
Android mailing list<br>
<a href="mailto:Android@videolan.org">Android@videolan.org</a><br>
<a href="http://mailman.videolan.org/listinfo/android" target="_blank">http://mailman.videolan.org/listinfo/android</a><br>
</blockquote></div><br>Can we not merge this into vlc.git?<br><br>-Edward Wang<br>