[vlc-devel] commit: Fix x264 playback on iPhone (fix: 96064b6c6af55d4fb3a9fb3f1328061bd2f33afa) (Jean-Paul Saman )

git version control git at videolan.org
Tue Sep 9 12:16:00 CEST 2008


vlc | branch: 0.8.6-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Tue Sep  9 12:03:34 2008 +0200| [273d1f5fe174b5fefaf6bbe5baf52d17ce06ee8d] | committer: Jean-Paul Saman 

Fix x264 playback on iPhone (fix: 96064b6c6af55d4fb3a9fb3f1328061bd2f33afa)

Removed line 726, which was a left over after merging the original mp4 patch in vlc.

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

 modules/mux/mp4.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index 31e8f2e..85d6513 100644
--- a/modules/mux/mp4.c
+++ b/modules/mux/mp4.c
@@ -2,7 +2,7 @@
  * mp4.c: mp4/mov muxer
  *****************************************************************************
  * Copyright (C) 2001, 2002, 2003, 2006 the VideoLAN team
- * $Id$
+ * $Id: 31e8f2e50cbdee424ca4f830c8a4a187ef3b508a $
  *
  * Authors: Laurent Aimar <fenrir at via.ecp.fr>
  *          Gildas Bazin <gbazin at videolan dot org>
@@ -723,7 +723,6 @@ static void ConvertAVC1( sout_mux_t *p_mux, mp4_stream_t *tk, block_t *p_block )
             memcpy( tk->avc.sps, &last[4], i_size );
 
             tk->avc.i_profile = tk->avc.sps[1];
-            tk->avc.i_profile = tk->avc.sps[2];
             tk->avc.i_profile_compat = tk->avc.sps[2];
             tk->avc.i_level   = tk->avc.sps[3];
         }




More information about the vlc-devel mailing list