diff options
author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-14 00:45:24 +0300 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-01-21 23:33:19 +0300 |
commit | 936f0d98f864f9f6bb4f9e5458b78537e146bacd (patch) | |
tree | bf3b42c3b14c40a2bdd3b3e06e267cae8345c992 /libavcodec/libopenh264enc.c | |
parent | d749615333084e62c9fcc480d1ae466369fdf14f (diff) |
lavc: Move rtp_payload_size to codec private options
This option is only used by mpegvideoenc and openh264.
It is a very codec-specific option, so deprecate the global variant.
The openh264 option is dropped altogether since it is just a fallback
for -max_nal_size anyway.
Signed-off-by: Vittorio Giovara <vittorio.giovara@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 04e7ffd210..747beef96b 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; } } |