[vlc-commits] mp4: improve debug and clean
Jean-Baptiste Kempf
git at videolan.org
Thu Aug 25 01:30:21 CEST 2011
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Aug 25 00:31:21 2011 +0200| [5a3638310ae18cf191fd73d90f28e74b11ba6627] | committer: Jean-Baptiste Kempf
mp4: improve debug and clean
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5a3638310ae18cf191fd73d90f28e74b11ba6627
---
modules/demux/mp4/libmp4.c | 2 +-
modules/demux/mp4/libmp4.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 95d8154..039fc59 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -756,7 +756,7 @@ static int MP4_ReadBox_hdlr( stream_t *p_stream, MP4_Box_t *p_box )
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream, "read box: \"hdlr\" handler type %4.4s name %s",
+ msg_Dbg( p_stream, "read box: \"hdlr\" handler type: \"%4.4s\" name: \"%s\"",
(char*)&p_box->data.p_hdlr->i_handler_type,
p_box->data.p_hdlr->psz_name );
diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index 86715b7..be71f45 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -19,10 +19,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+
#ifndef _VLC_MP4_H
#define _VLC_MP4_H 1
-
#define FOURCC_uuid VLC_FOURCC( 'u', 'u', 'i', 'd' )
#define FOURCC_ftyp VLC_FOURCC( 'f', 't', 'y', 'p' )
@@ -1082,7 +1082,6 @@ void MP4_BoxFree( stream_t *, MP4_Box_t *p_box );
*****************************************************************************/
void MP4_BoxDumpStructure( stream_t *p_input, MP4_Box_t *p_box );
-
/*****************************************************************************
* MP4_BoxGet: find a box given a path relative to p_box
*****************************************************************************
@@ -1105,6 +1104,7 @@ MP4_Box_t *MP4_BoxGet( MP4_Box_t *p_box, const char *psz_fmt, ... );
*****************************************************************************/
int MP4_BoxCount( MP4_Box_t *p_box, const char *psz_fmt, ... );
+/* Internal functions exposed for MKV demux */
int MP4_ReadBoxCommon( stream_t *p_stream, MP4_Box_t *p_box );
int MP4_ReadBox_sample_vide( stream_t *p_stream, MP4_Box_t *p_box );
void MP4_FreeBox_sample_vide( MP4_Box_t *p_box );
More information about the vlc-commits
mailing list