generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

matroskadec: cosmetics: remove useless braces

Browse Source 
Originally committed as revision 14575 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-08-05 00:41:10 +00:00
parent 3143f13345
commit 16f97ab050
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/matroskadec.c
View File

@ -1482,9 +1482,8 @@ matroska_read_header (AVFormatContext *s,
extradata[3] = 0xE5; extradata[3] = 0xE5;
extradata[4] = 0x80 | (sri<<3); extradata[4] = 0x80 | (sri<<3);
extradata_size = 5; extradata_size = 5;
} else { } else
extradata_size = 2; extradata_size = 2;
}
} }
else if (codec_id == CODEC_ID_TTA) { 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, av_log(matroska->ctx, AV_LOG_INFO,
"Unknown/unsupported CodecID %s.\n", "Unknown/unsupported CodecID %s.\n",
track->codec_id); track->codec_id);
}
av_set_pts_info(st, 64, matroska->time_scale*track->time_scale, 1000*1000*1000); /* 64 bit pts in ns */ 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; return res;
} }
st = track->stream; st = track->stream;
if (st->discard >= AVDISCARD_ALL) { if (st->discard >= AVDISCARD_ALL)
return res; return res;
}
if (duration == AV_NOPTS_VALUE) if (duration == AV_NOPTS_VALUE)
duration = track->default_duration / matroska->time_scale; 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; is_keyframe = flags & 0x80 ? PKT_FLAG_KEY : 0;
if (matroska->skip_to_keyframe) { if (matroska->skip_to_keyframe) {
if (!is_keyframe || st != matroska->skip_to_stream) { if (!is_keyframe || st != matroska->skip_to_stream)
return res; return res;
}
matroska->skip_to_keyframe = 0; matroska->skip_to_keyframe = 0;
} }