Changeset 124f8de18494066abe948cecdfe48dd907b5335d
- Timestamp:
- 11/07/08 22:07:41
(5 months ago)
- Author:
- Christophe Mutricy <xtophe@videolan.org>
- git-committer:
- Christophe Mutricy <xtophe@videolan.org> 1215806861 +0100
- git-parent:
[fe9b4d25e1359047110fd913d93707e7d2c142b2]
- git-author:
- Christophe Mutricy <xtophe@videolan.org> 1215800826 +0100
- Message:
Fix warnings
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rb6a8280 |
r124f8de |
|
| 168 | 168 | *****************************************************************************/ |
|---|
| 169 | 169 | static void MP4_TrackCreate ( demux_t *, mp4_track_t *, MP4_Box_t *); |
|---|
| 170 | | static void MP4_TrackDestroy( demux_t *, mp4_track_t * ); |
|---|
| | 170 | static void MP4_TrackDestroy( mp4_track_t * ); |
|---|
| 171 | 171 | |
|---|
| 172 | 172 | static int MP4_TrackSelect ( demux_t *, mp4_track_t *, mtime_t ); |
|---|
| … | … | |
| 234 | 234 | } |
|---|
| 235 | 235 | |
|---|
| 236 | | static inline int64_t MP4_TrackGetPTSDelta( demux_t *p_demux, mp4_track_t *p_track ) |
|---|
| | 236 | static inline int64_t MP4_TrackGetPTSDelta( mp4_track_t *p_track ) |
|---|
| 237 | 237 | { |
|---|
| 238 | 238 | mp4_chunk_t *ck = &p_track->chunk[p_track->i_chunk]; |
|---|
| … | … | |
| 689 | 689 | p_block->i_dts = MP4_TrackGetDTS( p_demux, tk ) + 1; |
|---|
| 690 | 690 | /* pts */ |
|---|
| 691 | | i_delta = MP4_TrackGetPTSDelta( p_demux, tk ); |
|---|
| | 691 | i_delta = MP4_TrackGetPTSDelta( tk ); |
|---|
| 692 | 692 | if( i_delta != -1 ) |
|---|
| 693 | 693 | p_block->i_pts = p_block->i_dts + i_delta; |
|---|
| … | … | |
| 975 | 975 | for( i_track = 0; i_track < p_sys->i_tracks; i_track++ ) |
|---|
| 976 | 976 | { |
|---|
| 977 | | MP4_TrackDestroy( p_demux, &p_sys->track[i_track] ); |
|---|
| | 977 | MP4_TrackDestroy( &p_sys->track[i_track] ); |
|---|
| 978 | 978 | } |
|---|
| 979 | 979 | FREENULL( p_sys->track ); |
|---|
| … | … | |
| 1014 | 1014 | { |
|---|
| 1015 | 1015 | const int64_t i_dts = MP4_TrackGetDTS( p_demux, tk ); |
|---|
| 1016 | | const int64_t i_pts_delta = MP4_TrackGetPTSDelta( p_demux, tk ); |
|---|
| | 1016 | const int64_t i_pts_delta = MP4_TrackGetPTSDelta( tk ); |
|---|
| 1017 | 1017 | const unsigned int i_size = MP4_TrackSampleSize( tk ); |
|---|
| 1018 | 1018 | |
|---|
| … | … | |
| 2161 | 2161 | * Destroy a track created by MP4_TrackCreate. |
|---|
| 2162 | 2162 | ****************************************************************************/ |
|---|
| 2163 | | static void MP4_TrackDestroy( demux_t *p_demux, mp4_track_t *p_track ) |
|---|
| | 2163 | static void MP4_TrackDestroy( mp4_track_t *p_track ) |
|---|
| 2164 | 2164 | { |
|---|
| 2165 | 2165 | unsigned int i_chunk; |
|---|