diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2007-02-28 17:56:45 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2007-02-28 17:56:45 +0000 |
| commit | ccec0f4f94adbcfe774dba4cb8d3b483dfac1b19 (patch) | |
| tree | 5486e5684966f7d114b18fec52459e5f08f8cab2 /libavcodec | |
| parent | 39c39d5f252c52f370a174d1f68e9195fea3be10 (diff) | |
| download | ffmpeg-ccec0f4f94adbcfe774dba4cb8d3b483dfac1b19.tar.gz | |
get rid of rtp_mode field after next major bump
Originally committed as revision 8164 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/utils.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f45a8b8644..ffa9dbc4e8 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -907,8 +907,10 @@ typedef struct AVCodecContext { 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 --git a/libavcodec/utils.c b/libavcodec/utils.c index 3866a5e5f5..398c299f0e 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -473,7 +473,9 @@ static const AVOption options[]={ {"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}, |