From ea0fe83b0f2866261e0676135d51339d29747510 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Thu, 1 Mar 2007 16:36:38 +0000 Subject: [PATCH] remove ps option and rename rtp_payload_size AVOption to ps Originally committed as revision 8172 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 12 ------------ libavcodec/utils.c | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index e2e2e6170..122017b7d 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -127,7 +127,6 @@ static int video_codec_id = CODEC_ID_NONE; static int video_codec_tag = 0; static int same_quality = 0; static int do_deinterlace = 0; -static int packet_size = 0; static int strict = 0; static int top_field_first = -1; static int me_threshold = 0; @@ -2305,11 +2304,6 @@ static void opt_qdiff(const char *arg) } } -static void opt_packet_size(const char *arg) -{ - packet_size= atoi(arg); -} - static void opt_strict(const char *arg) { strict= atoi(arg); @@ -2843,11 +2837,6 @@ static void new_video_stream(AVFormatContext *oc) video_enc->intra_dc_precision= intra_dc_precision - 8; video_enc->strict_std_compliance = strict; - if(packet_size){ - video_enc->rtp_mode= 1; - video_enc->rtp_payload_size= packet_size; - } - if (do_psnr) video_enc->flags|= CODEC_FLAG_PSNR; @@ -3625,7 +3614,6 @@ const OptionDef options[] = { { "me", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_motion_estimation}, "set motion estimation method", "method" }, { "me_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_me_threshold}, "motion estimaton threshold", "" }, - { "ps", HAS_ARG | OPT_EXPERT, {(void*)opt_packet_size}, "set packet size in bits", "size" }, { "strict", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_strict}, "how strictly to follow the standards", "strictness" }, { "sameq", OPT_BOOL | OPT_VIDEO, {(void*)&same_quality}, "use same video quality as source (implies VBR)" }, diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 398c299f0..a42219f91 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -476,7 +476,7 @@ static const AVOption options[]={ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) {"rtp_mode", NULL, OFFSET(rtp_mode), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, #endif -{"rtp_payload_size", NULL, OFFSET(rtp_payload_size), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, +{"ps", "rtp payload size in bits", OFFSET(rtp_payload_size), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"mv_bits", NULL, OFFSET(mv_bits), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, {"header_bits", NULL, OFFSET(header_bits), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, {"i_tex_bits", NULL, OFFSET(i_tex_bits), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, -- 2.11.0