Commit 3d8bedef authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '91bfac75'

* commit '91bfac75':
  h261enc: Disallow sliced encoding
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 5d97af0c 91bfac75
......@@ -728,6 +728,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
s->out_format = FMT_H261;
avctx->delay = 0;
s->low_delay = 1;
s->rtp_mode = 0; /* Sliced encoding not supported */
break;
case AV_CODEC_ID_H263:
if (!CONFIG_H263_ENCODER)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment