diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-18 20:54:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-18 21:10:56 +0100 |
| commit | 3d8bedef45a34f099ff85fc1d2b140f6ce88fb85 (patch) | |
| tree | 7c870ad0599c6a743d8e161598097466b186af8a /libavcodec | |
| parent | 5d97af0cb2a67ba7f708477dc3f0b5220ac27f43 (diff) | |
| parent | 91bfac759dfd536e439ad3e35964705012c6a5a7 (diff) | |
| download | ffmpeg-3d8bedef45a34f099ff85fc1d2b140f6ce88fb85.tar.gz | |
Merge commit '91bfac759dfd536e439ad3e35964705012c6a5a7'
* commit '91bfac759dfd536e439ad3e35964705012c6a5a7':
h261enc: Disallow sliced encoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 27153cf6a8..17d0fbf1f7 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -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) |