[vlc-commits] commit: AVFormat : Don't drop metadata keys. (Jai Menon )

git at videolan.org git at videolan.org
Sun Jul 18 18:21:29 CEST 2010


vlc/vlc-1.1 | branch: master | Jai Menon <jmenon86 at gmail.com> | Sun Jul 18 19:01:31 2010 +0530| [08e3cf3a288cf8e3000fbd848ffcf8edb40969b1] | committer: Jean-Baptiste Kempf 

AVFormat : Don't drop metadata keys.

The current code seems to require _all_ metadata fields to be populated
which seems a bit unreasonable.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 7d9488cf0055fb8baf3b1d619d30824e7f8c4a10)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/demux/avformat/demux.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 757f353..a3028a5 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -742,13 +742,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
         {
             vlc_meta_t *p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
 
-            if( !p_sys->ic->title[0] || !p_sys->ic->author[0] ||
-                !p_sys->ic->copyright[0] || !p_sys->ic->comment[0] ||
-                /*!p_sys->ic->album[0] ||*/ !p_sys->ic->genre[0] )
-            {
-                return VLC_EGENERIC;
-            }
-
             if( p_sys->ic->title[0] )
                 vlc_meta_SetTitle( p_meta, p_sys->ic->title );
             if( p_sys->ic->author[0] )



More information about the vlc-commits mailing list