Commit 13834c10 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/mpegvideo_enc: Remove slice structured mode from H.263 as well as the...

avcodec/mpegvideo_enc: Remove slice structured mode from H.263 as well as the code automatically enabing it

There is no such thing as a slice structured mode in the original version 1  H.263,
that mode was added in H.263+ in 1998. Also the headers for slice structured mode
are not part of the older version 1 and this would result in unplayable files

An alternative to this patch would be to merge the H263 and H263P AVCodecs and use
other means to distinguish the older and newer versions.
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 188a1a17
......@@ -917,7 +917,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (s->slice_context_count > 1) {
s->rtp_mode = 1;
if (avctx->codec_id == AV_CODEC_ID_H263 || avctx->codec_id == AV_CODEC_ID_H263P)
if (avctx->codec_id == AV_CODEC_ID_H263P)
s->h263_slice_structured = 1;
}
......@@ -4681,7 +4681,6 @@ int ff_dct_quantize_c(MpegEncContext *s,
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption h263_options[] = {
{ "obmc", "use overlapped block motion compensation.", OFFSET(obmc), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE },
{ "structured_slices","Write slice start position at every GOB header instead of just GOB number.", OFFSET(h263_slice_structured), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE},
{ "mb_info", "emit macroblock info for RFC 2190 packetization, the parameter value is the maximum payload size", OFFSET(mb_info), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
FF_MPV_COMMON_OPTS
{ NULL },
......
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