diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 13:23:49 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 13:23:49 +0200 |
| commit | edb4c445119501070cb00be1696d47c6d6462e2a (patch) | |
| tree | 940d79e03eb4d23786b90bf5e539192fa7b818ba /libavcodec | |
| parent | 2335e189fb7bcbee2eac6ec9a5756c29f6782a5b (diff) | |
| parent | 31aa5335c390c83a6c3ea955b155067c36c4a2c4 (diff) | |
| download | ffmpeg-edb4c445119501070cb00be1696d47c6d6462e2a.tar.gz | |
Merge commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4'
* commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4':
libopenh264enc: Fix inconsistent whitespace
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libopenh264enc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 07af31d2cc..14afe90795 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; } |