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/libx264.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/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 07756d0278..5030d65f79 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -675,16 +675,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (x4->slice_max_size >= 0) x4->params.i_slice_max_size = x4->slice_max_size; - else { - /* - * Allow x264 to be instructed through AVCodecContext about the maximum - * size of the RTP payload. For example, this enables the production of - * payload suitable for the H.264 RTP packetization-mode 0 i.e. single - * NAL unit per RTP packet. - */ - if (avctx->rtp_payload_size) - x4->params.i_slice_max_size = avctx->rtp_payload_size; - } if (x4->fastfirstpass) x264_param_apply_fastfirstpass(&x4->params); |