Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@googlemail.com>
---
libavformat/matroskadec.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 6c796e8a4a..0f04389a4e 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1571,7 +1571,7 @@ static void matroska_convert_tags(AVFormatContext *s)
static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska,
uint64_t pos)
{
- uint32_t saved_id = matroska->current_id;
+ uint32_t saved_id = matroska->current_id;
int64_t before_pos = avio_tell(matroska->ctx->pb);
MatroskaLevel level;
int64_t offset;
@@ -2625,7 +2625,7 @@ static int matroska_read_header(AVFormatContext *s)
/* The next thing is a segment. */
pos = avio_tell(matroska->ctx->pb);
res = ebml_parse(matroska, matroska_segments, matroska);
- // try resyncing until we find a EBML_STOP type element.
+ // try resyncing until we find an EBML_STOP type element.
while (res != 1) {
res = matroska_resync(matroska, pos);
if (res < 0)
@@ -3458,19 +3458,19 @@ static int matroska_parse_cluster(MatroskaDemuxContext
*matroska)
}
if (!res && block->bin.size > 0) {
- int is_keyframe = block->non_simple ? block->reference ==
INT64_MIN : -1;
- uint8_t* additional = block->additional.size > 0 ?
- block->additional.data : NULL;
- if (!block->non_simple)
- block->duration = 0;
- res = matroska_parse_block(matroska, block->bin.buf,
block->bin.data,
- block->bin.size, block->bin.pos,
- matroska->current_cluster.timecode,
- block->duration, is_keyframe,
- additional, block->additional_id,
- block->additional.size,
- matroska->current_cluster_pos,
- block->discard_padding);
+ int is_keyframe = block->non_simple ? block->reference == INT64_MIN :
-1;
+ uint8_t* additional = block->additional.size > 0 ?
+ block->additional.data : NULL;
+ if (!block->non_simple)
+ block->duration = 0;
+ res = matroska_parse_block(matroska, block->bin.buf, block->bin.data,
+ block->bin.size, block->bin.pos,
+ matroska->current_cluster.timecode,
+ block->duration, is_keyframe,
+ additional, block->additional_id,
+ block->additional.size,
+ matroska->current_cluster_pos,
+ block->discard_padding);
}
ebml_free(matroska_blockgroup, block);
@@ -3869,7 +3869,7 @@ static int webm_dash_manifest_cues(AVFormatContext *s,
int64_t init_range)
// cues end
av_dict_set_int(&s->streams[0]->metadata, CUES_END, cues_end, 0);
- // if the file has cues at the start, fix up the init range so tht
+ // if the file has cues at the start, fix up the init range so that
// it does not include it
if (cues_start <= init_range)
av_dict_set_int(&s->streams[0]->metadata, INITIALIZATION_RANGE,
cues_start - 1, 0);
--
2.19.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
