Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
4e44edef
Commit
4e44edef
authored
May 18, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MP4: small cosmetics fixes
parent
1e7532bb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
17 deletions
+17
-17
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+5
-5
modules/demux/mp4/libmp4.h
modules/demux/mp4/libmp4.h
+11
-11
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+1
-1
No files found.
modules/demux/mp4/libmp4.c
View file @
4e44edef
/*****************************************************************************
* libmp4.c : LibMP4 library for mp4 module for vlc
*****************************************************************************
* Copyright (C) 2001-2004 the VideoLAN team
* Copyright (C) 2001-2004
, 2010
the VideoLAN team
* $Id$
*
* Author: Laurent Aimar <fenrir@via.ecp.fr>
...
...
@@ -20,13 +20,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_demux.h>
#ifdef HAVE_ZLIB_H
...
...
@@ -38,9 +37,10 @@
/*****************************************************************************
* Here are defined some macro to make life simpler but before using it
*
*look* at the code.
* *look* at the code.
*
*****************************************************************************/
#define MP4_BOX_HEADERSIZE( p_box ) \
( 8 + ( p_box->i_shortsize == 1 ? 8 : 0 ) \
+ ( p_box->i_type == FOURCC_uuid ? 16 : 0 ) )
...
...
@@ -114,7 +114,7 @@
/* Some assumptions:
* The input method HAVE
to be seekable
* The input method HAS
to be seekable
*/
...
...
modules/demux/mp4/libmp4.h
View file @
4e44edef
...
...
@@ -920,17 +920,17 @@ typedef union MP4_Box_data_s
MP4_Box_data_stts_t
*
p_stts
;
MP4_Box_data_ctts_t
*
p_ctts
;
MP4_Box_data_stsd_t
*
p_stsd
;
MP4_Box_data_sample_vide_t
*
p_sample_vide
;
MP4_Box_data_sample_soun_t
*
p_sample_soun
;
MP4_Box_data_sample_text_t
*
p_sample_text
;
MP4_Box_data_sample_hint_t
*
p_sample_hint
;
MP4_Box_data_esds_t
*
p_esds
;
MP4_Box_data_avcC_t
*
p_avcC
;
MP4_Box_data_dac3_t
*
p_dac3
;
MP4_Box_data_enda_t
*
p_enda
;
MP4_Box_data_gnre_t
*
p_gnre
;
MP4_Box_data_trkn_t
*
p_trkn
;
MP4_Box_data_sample_vide_t
*
p_sample_vide
;
MP4_Box_data_sample_soun_t
*
p_sample_soun
;
MP4_Box_data_sample_text_t
*
p_sample_text
;
MP4_Box_data_sample_hint_t
*
p_sample_hint
;
MP4_Box_data_esds_t
*
p_esds
;
MP4_Box_data_avcC_t
*
p_avcC
;
MP4_Box_data_dac3_t
*
p_dac3
;
MP4_Box_data_enda_t
*
p_enda
;
MP4_Box_data_gnre_t
*
p_gnre
;
MP4_Box_data_trkn_t
*
p_trkn
;
MP4_Box_data_stsz_t
*
p_stsz
;
MP4_Box_data_stz2_t
*
p_stz2
;
...
...
modules/demux/mp4/mp4.c
View file @
4e44edef
...
...
@@ -935,7 +935,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case
FOURCC_0xa9enc
:
/* Encoded By */
SET
(
vlc_meta_SetEncodedBy
);
break
;
case
FOURCC_0xa9swr
:
case
FOURCC_0xa9inf
:
/* Information */
case
FOURCC_0xa9dir
:
/* Director */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment