Message ID | 1466719590-41325-1-git-send-email-martin@martin.st |
---|---|
State | Committed |
Commit | 31aa5335c390c83a6c3ea955b155067c36c4a2c4 |
Headers | show |
On 24/06/16 00:06, Martin Storsjö wrote: > --- > libavcodec/libopenh264enc.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c > index ceb9a01..ab2adf0 100644 > --- a/libavcodec/libopenh264enc.c > +++ b/libavcodec/libopenh264enc.c > @@ -150,8 +150,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; > } > > Ok.
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index ceb9a01..ab2adf0 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -150,8 +150,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; }