vlc | branch: master | Filip Roséen <[email protected]> | Mon May 9 14:53:22 2016 +0200| [dd9ea8feba9cf51f02fb2af0eda2301b00dcbdb0] | committer: Jean-Baptiste Kempf
mkv: whitespace cleaning + correcting header includes Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dd9ea8feba9cf51f02fb2af0eda2301b00dcbdb0 --- modules/demux/mkv/matroska_segment.cpp | 1 - modules/demux/mkv/matroska_segment_parse.cpp | 1 + modules/demux/mkv/matroska_segment_seeker.cpp | 1 + modules/demux/mkv/matroska_segment_seeker.hpp | 2 +- modules/demux/mkv/mkv.cpp | 4 +++- modules/demux/mkv/util.cpp | 1 - 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp index 743a5f4..85a9c55 100644 --- a/modules/demux/mkv/matroska_segment.cpp +++ b/modules/demux/mkv/matroska_segment.cpp @@ -1197,7 +1197,6 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, KaxSimpleBlock * & pp_s vars.i_duration -= i_duration; } #endif - E_CASE_DEFAULT( element ) { VLC_UNUSED(element); diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp index 5727633..2571670 100644 --- a/modules/demux/mkv/matroska_segment_parse.cpp +++ b/modules/demux/mkv/matroska_segment_parse.cpp @@ -604,6 +604,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) vars.tk->i_original_rate = value; vars.tk->fmt.audio.i_rate = value; + debug( vars, "afreq=%d", vars.tk->fmt.audio.i_rate ) ; } E_CASE( KaxAudioOutputSamplingFreq, afreq ) diff --git a/modules/demux/mkv/matroska_segment_seeker.cpp b/modules/demux/mkv/matroska_segment_seeker.cpp index 9bc694a..49750a1 100644 --- a/modules/demux/mkv/matroska_segment_seeker.cpp +++ b/modules/demux/mkv/matroska_segment_seeker.cpp @@ -30,6 +30,7 @@ #include "stream_io_callback.hpp" #include <sstream> +#include <limits> namespace { template<class It, class T> diff --git a/modules/demux/mkv/matroska_segment_seeker.hpp b/modules/demux/mkv/matroska_segment_seeker.hpp index 6ce6550..ee78356 100644 --- a/modules/demux/mkv/matroska_segment_seeker.hpp +++ b/modules/demux/mkv/matroska_segment_seeker.hpp @@ -26,10 +26,10 @@ #include "mkv.hpp" -#include <cstdint> #include <algorithm> #include <vector> #include <map> +#include <limits> class matroska_segment_c; diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp index d85f809..76c8983 100644 --- a/modules/demux/mkv/mkv.cpp +++ b/modules/demux/mkv/mkv.cpp @@ -550,9 +550,10 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock block_size = simpleblock->GetSize(); else block_size = block->GetSize(); - + const unsigned int i_number_frames = block != NULL ? block->NumberFrames() : ( simpleblock != NULL ? simpleblock->NumberFrames() : 0 ); + for( unsigned int i_frame = 0; i_frame < i_number_frames; i_frame++ ) { block_t *p_block; @@ -715,6 +716,7 @@ static int Demux( demux_t *p_demux) int64_t i_block_duration = 0; bool b_key_picture; bool b_discardable_picture; + if( p_segment->BlockGet( block, simpleblock, &b_key_picture, &b_discardable_picture, &i_block_duration ) ) { if ( p_vsegment->CurrentEdition() && p_vsegment->CurrentEdition()->b_ordered ) diff --git a/modules/demux/mkv/util.cpp b/modules/demux/mkv/util.cpp index eb817d6..11736d9 100644 --- a/modules/demux/mkv/util.cpp +++ b/modules/demux/mkv/util.cpp @@ -25,7 +25,6 @@ #include "util.hpp" #include "demux.hpp" -#include <stdint.h> /***************************************************************************** * Local prototypes *****************************************************************************/ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
