[Android] libvlc_media_track_info_t: Move new fields at the end of the structure

[Edward Wang]

On Thu, Apr 12, 2012 at 1:41 PM, Sébastien Toque <git at videolan.org> wrote:

> android | branch: master | Sébastien Toque <xilasz at gmail.com> | Thu Apr
> 12 19:27:17 2012 +0200| [5cf9c9b89c1218bb15484b89bf1b7cd35700e9da] |
> committer: Sébastien Toque
>
> libvlc_media_track_info_t: Move new fields at the end of the structure
>
> >
> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=5cf9c9b89c1218bb15484b89bf1b7cd35700e9da
> ---
>
>  ...language-and-frame-rate-to-libvlc_media_t.patch |   22
> ++++++++-----------
>  1 files changed, 9 insertions(+), 13 deletions(-)
>
> 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
> index d12f362..e4e4d4c 100644
> ---
> 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
> @@ -1,6 +1,6 @@
> -From 283011cced8ee43f19747d14f5b257d0b00e5039 Mon Sep 17 00:00:00 2001
> +From 52e0e35615298f7589f116c3835f6a67fafe0de1 Mon Sep 17 00:00:00 2001
>  From: =?UTF-8?q?S=C3=A9bastien=20Toque?= <xilasz at gmail.com>
> -Date: Wed, 11 Apr 2012 21:30:31 +0200
> +Date: Thu, 12 Apr 2012 19:22:43 +0200
>  Subject: [PATCH 3/3] libvlc: add language and frame rate to
>  libvlc_media_track_info_t
>
> @@ -10,19 +10,10 @@ Subject: [PATCH 3/3] libvlc: add language and frame
> rate to
>  2 files changed, 6 insertions(+), 0 deletions(-)
>
>  diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h
> -index 279a29c..e43a5b4 100644
> +index 279a29c..577e363 100644
>  --- a/include/vlc/libvlc_media.h
>  +++ b/include/vlc/libvlc_media.h
> -@@ -150,6 +150,8 @@ typedef struct libvlc_media_track_info_t
> -     int         i_id;
> -     libvlc_track_type_t i_type;
> -
> -+    char        *psz_language;
> -+
> -     /* Codec specific */
> -     int         i_profile;
> -     int         i_level;
> -@@ -164,6 +166,7 @@ typedef struct libvlc_media_track_info_t
> +@@ -164,9 +164,12 @@ typedef struct libvlc_media_track_info_t
>              /* Video specific */
>              unsigned    i_height;
>              unsigned    i_width;
> @@ -30,6 +21,11 @@ index 279a29c..e43a5b4 100644
>          } video;
>      } u;
>
> ++    char *psz_language;
> ++
> + } libvlc_media_track_info_t;
> +
> +
>  diff --git a/lib/media.c b/lib/media.c
>  index 2c01c80..4bc832b 100644
>  --- a/lib/media.c
>
> _______________________________________________
> Android mailing list
> Android at videolan.org
> http://mailman.videolan.org/listinfo/android
>

Can we not merge this into vlc.git?

-Edward Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/android/attachments/20120412/0e5d1e86/attachment.html>