summaryrefslogtreecommitdiff
path: root/libavformat/matroskadec.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2008-08-05 00:41:10 +0000
committerAurelien Jacobs <aurel@gnuage.org>2008-08-05 00:41:10 +0000
commit16f97ab050cf78857e5692a4b040f7d8e235162a (patch)
tree1be5ca5f924e2aca283e72ab71194c85078f2b16 /libavformat/matroskadec.c
parent3143f13345e4a206dc03491255116a1eb8119ae0 (diff)
matroskadec: cosmetics: remove useless braces
Originally committed as revision 14575 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroskadec.c')
-rw-r--r--libavformat/matroskadec.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index ea3d8c4632..e5e7fc54cb 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1482,9 +1482,8 @@ matroska_read_header (AVFormatContext *s,
extradata[3] = 0xE5;
extradata[4] = 0x80 | (sri<<3);
extradata_size = 5;
- } else {
+ } else
extradata_size = 2;
- }
}
else if (codec_id == CODEC_ID_TTA) {
@@ -1538,11 +1537,10 @@ matroska_read_header (AVFormatContext *s,
}
}
- if (codec_id == CODEC_ID_NONE) {
+ if (codec_id == CODEC_ID_NONE)
av_log(matroska->ctx, AV_LOG_INFO,
"Unknown/unsupported CodecID %s.\n",
track->codec_id);
- }
av_set_pts_info(st, 64, matroska->time_scale*track->time_scale, 1000*1000*1000); /* 64 bit pts in ns */
@@ -1677,9 +1675,8 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size,
return res;
}
st = track->stream;
- if (st->discard >= AVDISCARD_ALL) {
+ if (st->discard >= AVDISCARD_ALL)
return res;
- }
if (duration == AV_NOPTS_VALUE)
duration = track->default_duration / matroska->time_scale;
@@ -1692,9 +1689,8 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size,
is_keyframe = flags & 0x80 ? PKT_FLAG_KEY : 0;
if (matroska->skip_to_keyframe) {
- if (!is_keyframe || st != matroska->skip_to_stream) {
+ if (!is_keyframe || st != matroska->skip_to_stream)
return res;
- }
matroska->skip_to_keyframe = 0;
}