# HG changeset patch # User bcoudurier # Date 1172685405 0 # Node ID 62e88c68166c53625aa64a7d43a0c103a79ff29a # Parent d15120610df21fff144c2553f8c9e24b207dfd1d get rid of rtp_mode field after next major bump diff -r d15120610df2 -r 62e88c68166c avcodec.h --- a/avcodec.h Wed Feb 28 17:40:31 2007 +0000 +++ b/avcodec.h Wed Feb 28 17:56:45 2007 +0000 @@ -907,8 +907,10 @@ void *priv_data; +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) /* unused, FIXME remove*/ int rtp_mode; +#endif int rtp_payload_size; /* The size of the RTP payload: the coder will */ /* do it's best to deliver a chunk with size */ diff -r d15120610df2 -r 62e88c68166c utils.c --- a/utils.c Wed Feb 28 17:40:31 2007 +0000 +++ b/utils.c Wed Feb 28 17:56:45 2007 +0000 @@ -473,7 +473,9 @@ {"rc_strategy", "ratecontrol method", OFFSET(rc_strategy), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"b_strategy", "strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), FF_OPT_TYPE_INT, 0, INT_MIN, INT_MAX, V|E}, {"hurry_up", NULL, OFFSET(hurry_up), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|D}, +#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}, {"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},