ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Fri Oct 7 13:23:49 2016 +0200| [edb4c445119501070cb00be1696d47c6d6462e2a] | committer: Hendrik Leppkes
Merge commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4' * commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4': libopenh264enc: Fix inconsistent whitespace Merged-by: Hendrik Leppkes <h.lepp...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=edb4c445119501070cb00be1696d47c6d6462e2a --- libavcodec/libopenh264enc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 07af31d..14afe90 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -163,8 +163,10 @@ FF_ENABLE_DEPRECATION_WARNINGS param.sSpatialLayers[0].iSpatialBitrate = param.iTargetBitrate; param.sSpatialLayers[0].iMaxSpatialBitrate = param.iMaxBitrate; - if ((avctx->slices > 1) && (s->max_nal_size)){ - av_log(avctx,AV_LOG_ERROR,"Invalid combination -slices %d and -max_nal_size %d.\n",avctx->slices,s->max_nal_size); + if ((avctx->slices > 1) && (s->max_nal_size)) { + av_log(avctx, AV_LOG_ERROR, + "Invalid combination -slices %d and -max_nal_size %d.\n", + avctx->slices, s->max_nal_size); goto fail; } ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
