Mercurial > libavcodec.hg
changeset 9722:0bfb23c7633d libavcodec
remove apparently unused real_pict_num from AVCodecContext
| author | bcoudurier |
|---|---|
| date | Wed, 27 May 2009 21:40:10 +0000 |
| parents | 5d0f71ba8648 |
| children | 11839f0e3908 |
| files | avcodec.h mpegvideo_enc.c options.c |
| diffstat | 3 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/avcodec.h Wed May 27 19:55:35 2009 +0000 +++ b/avcodec.h Wed May 27 21:40:10 2009 +0000 @@ -31,7 +31,7 @@ #define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MINOR 29 -#define LIBAVCODEC_VERSION_MICRO 0 +#define LIBAVCODEC_VERSION_MICRO 1 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -1117,7 +1117,9 @@ */ int frame_size; int frame_number; ///< audio or video frame number +#if LIBAVCODEC_VERSION_MAJOR < 53 int real_pict_num; ///< Returns the real picture number of previous encoded frame. +#endif /** * Number of frames the decoded output will be delayed relative to
--- a/mpegvideo_enc.c Wed May 27 19:55:35 2009 +0000 +++ b/mpegvideo_enc.c Wed May 27 21:40:10 2009 +0000 @@ -1216,7 +1216,6 @@ if (encode_picture(s, s->picture_number) < 0) return -1; - avctx->real_pict_num = s->picture_number; avctx->header_bits = s->header_bits; avctx->mv_bits = s->mv_bits; avctx->misc_bits = s->misc_bits;
--- a/options.c Wed May 27 19:55:35 2009 +0000 +++ b/options.c Wed May 27 21:40:10 2009 +0000 @@ -111,7 +111,9 @@ {"cutoff", "set cutoff bandwidth", OFFSET(cutoff), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, A|E}, {"frame_size", NULL, OFFSET(frame_size), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, A|E}, {"frame_number", NULL, OFFSET(frame_number), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, +#if LIBAVCODEC_VERSION_MAJOR < 53 {"real_pict_num", NULL, OFFSET(real_pict_num), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, +#endif {"delay", NULL, OFFSET(delay), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, {"qcomp", "video quantizer scale compression (VBR)", OFFSET(qcompress), FF_OPT_TYPE_FLOAT, 0.5, -FLT_MAX, FLT_MAX, V|E}, {"qblur", "video quantizer scale blur (VBR)", OFFSET(qblur), FF_OPT_TYPE_FLOAT, 0.5, 0, FLT_MAX, V|E},