From ddf5ef02638daf115775c1300557ee102e3f9abe Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Wed, 17 Aug 2011 19:26:49 +0200
Subject: [PATCH] avconv: remove -intra option.
It's equivalent to -g 0.
---
Changelog | 1 +
avconv.c | 4 ----
doc/avconv.texi | 2 --
tests/lavf-regression.sh | 2 +-
4 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/Changelog b/Changelog
index 293376a2d7d..636cdbb5a89 100644
--- a/Changelog
+++ b/Changelog
@@ -39,6 +39,7 @@ easier to use. The changes are:
* Presets in avconv are disabled, because only libx264 used them and
presets for libx264 can now be specified using a private option
'-preset <presetname>'.
+ * -intra option was removed, it's equivalent to -g 0.
- XMV demuxer
diff --git a/avconv.c b/avconv.c
index 4a5830f3261..e81e3180698 100644
--- a/avconv.c
+++ b/avconv.c
@@ -143,7 +143,6 @@ static int qp_hist = 0;
static char *vfilters = NULL;
#endif
-static int intra_only = 0;
static int audio_sample_rate = 0;
#define QSCALE_NONE -99999
static float audio_qscale = QSCALE_NONE;
@@ -3166,8 +3165,6 @@ static OutputStream *new_video_stream(AVFormatContext *oc)
video_enc->pix_fmt = frame_pix_fmt;
st->sample_aspect_ratio = video_enc->sample_aspect_ratio;
- if (intra_only)
- video_enc->gop_size = 0;
if (video_qscale || same_quant) {
video_enc->flags |= CODEC_FLAG_QSCALE;
video_enc->global_quality = FF_QP2LAMBDA * video_qscale;
@@ -4089,7 +4086,6 @@ static const OptionDef options[] = {
{ "padleft", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "size" },
{ "padright", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "size" },
{ "padcolor", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "color" },
- { "intra", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&intra_only}, "use only intra frames"},
{ "vn", OPT_BOOL | OPT_VIDEO, {(void*)&video_disable}, "disable video" },
{ "vdt", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&video_discard}, "discard threshold", "n" },
{ "qscale", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qscale}, "use fixed video quantizer scale (VBR)", "q" },
diff --git a/doc/avconv.texi b/doc/avconv.texi
index 93f353a24bc..97ba88144de 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -354,8 +354,6 @@ pixel formats.
Set SwScaler flags.
@item -g @var{gop_size}
Set the group of pictures size.
-@item -intra
-Use only intra frames.
@item -vdt @var{n}
Discard threshold.
@item -qscale @var{q}
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index bb7a4979797..859ccb946e6 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -67,7 +67,7 @@ do_lavf mxf "-ar 48000 -bf 2 -timecode_frame_start 264363"
fi
if [ -n "$do_mxf_d10" ]; then
-do_lavf mxf_d10 "-ar 48000 -ac 2 -r 25 -s 720x576 -vf pad=720:608:0:32 -vcodec mpeg2video -intra -flags +ildct+low_delay -dc 10 -flags2 +ivlc+non_linear_q -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
+do_lavf mxf_d10 "-ar 48000 -ac 2 -r 25 -s 720x576 -vf pad=720:608:0:32 -vcodec mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -flags2 +ivlc+non_linear_q -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
fi
if [ -n "$do_ts" ] ; then
--
GitLab