diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-31 13:19:50 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-31 13:19:50 +0000 |
| commit | 899e19f1776c607c126b291a7e0a614782f18f42 (patch) | |
| tree | 50792a530d56f35fff93eab04e03c2b8a6b8ad95 /libavcodec/libopenh264enc.c | |
| parent | 9938697c1c119a675759029ead74b91c529cdf2e (diff) | |
| parent | 936f0d98f864f9f6bb4f9e5458b78537e146bacd (diff) | |
| download | ffmpeg-899e19f1776c607c126b291a7e0a614782f18f42.tar.gz | |
Merge commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd'
* commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd':
lavc: Move rtp_payload_size to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/libopenh264enc.c')
| -rw-r--r-- | libavcodec/libopenh264enc.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 6434de5cac..6850568ef6 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -203,14 +203,9 @@ FF_ENABLE_DEPRECATION_WARNINGS param.uiMaxNalSize = s->max_nal_size; param.sSpatialLayers[0].sSliceCfg.sSliceArgument.uiSliceSizeConstraint = s->max_nal_size; } else { - if (avctx->rtp_payload_size) { - av_log(avctx,AV_LOG_DEBUG,"Using RTP Payload size for uiMaxNalSize"); - param.uiMaxNalSize = avctx->rtp_payload_size; - param.sSpatialLayers[0].sSliceCfg.sSliceArgument.uiSliceSizeConstraint = avctx->rtp_payload_size; - } else { - av_log(avctx,AV_LOG_ERROR,"Invalid -max_nal_size, specify a valid max_nal_size to use -slice_mode dyn\n"); - goto fail; - } + av_log(avctx, AV_LOG_ERROR, "Invalid -max_nal_size, " + "specify a valid max_nal_size to use -slice_mode dyn\n"); + goto fail; } } |