[FFmpeg-cvslog] avformat/matroskaenc: Reindent after previous commit
Andreas Rheinhardt
git at videolan.org
Thu Apr 2 21:40:27 EEST 2020
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Fri Jan 17 20:40:15 2020 +0100| [bc52ce309dfcec6151bf1776e6a256f547285700] | committer: Andreas Rheinhardt
avformat/matroskaenc: Reindent after previous commit
Also remove { } after an if if there is only one statement inside { }.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc52ce309dfcec6151bf1776e6a256f547285700
---
libavformat/matroskaenc.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index ec9f4cfdf4..d3075d7ec4 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1284,22 +1284,21 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
case AVMEDIA_TYPE_AUDIO:
if (par->initial_padding && par->codec_id == AV_CODEC_ID_OPUS) {
- int64_t codecdelay = av_rescale_q(par->initial_padding,
- (AVRational){ 1, 48000 },
- (AVRational){ 1, 1000000000 });
- if (codecdelay < 0) {
- av_log(s, AV_LOG_ERROR, "Initial padding is invalid\n");
- return AVERROR(EINVAL);
- }
-// mkv->tracks[i].ts_offset = av_rescale_q(par->initial_padding,
-// (AVRational){ 1, par->sample_rate },
-// st->time_base);
+ int64_t codecdelay = av_rescale_q(par->initial_padding,
+ (AVRational){ 1, 48000 },
+ (AVRational){ 1, 1000000000 });
+ if (codecdelay < 0) {
+ av_log(s, AV_LOG_ERROR, "Initial padding is invalid\n");
+ return AVERROR(EINVAL);
+ }
+// mkv->tracks[i].ts_offset = av_rescale_q(par->initial_padding,
+// (AVRational){ 1, par->sample_rate },
+// st->time_base);
- put_ebml_uint(pb, MATROSKA_ID_CODECDELAY, codecdelay);
- }
- if (par->codec_id == AV_CODEC_ID_OPUS) {
- put_ebml_uint(pb, MATROSKA_ID_SEEKPREROLL, OPUS_SEEK_PREROLL);
- }
+ put_ebml_uint(pb, MATROSKA_ID_CODECDELAY, codecdelay);
+ }
+ if (par->codec_id == AV_CODEC_ID_OPUS)
+ put_ebml_uint(pb, MATROSKA_ID_SEEKPREROLL, OPUS_SEEK_PREROLL);
put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO);
More information about the ffmpeg-cvslog
mailing list