mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
Merge commit '91bfac759dfd536e439ad3e35964705012c6a5a7'
* commit '91bfac759dfd536e439ad3e35964705012c6a5a7': h261enc: Disallow sliced encoding Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3d8bedef45
@ -728,6 +728,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
|
|||||||
s->out_format = FMT_H261;
|
s->out_format = FMT_H261;
|
||||||
avctx->delay = 0;
|
avctx->delay = 0;
|
||||||
s->low_delay = 1;
|
s->low_delay = 1;
|
||||||
|
s->rtp_mode = 0; /* Sliced encoding not supported */
|
||||||
break;
|
break;
|
||||||
case AV_CODEC_ID_H263:
|
case AV_CODEC_ID_H263:
|
||||||
if (!CONFIG_H263_ENCODER)
|
if (!CONFIG_H263_ENCODER)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user