diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-02-15 17:30:30 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-08 07:41:21 +0100 |
| commit | 1296b1f6c0631ab79464e22d48a6a1548450b943 (patch) | |
| tree | bb00388e7b945c85490ea205e7f60ca57ffc1811 | |
| parent | ddcca4ba074aa537c3059c76d69eb4ad6316bfe9 (diff) | |
| download | ffmpeg-1296b1f6c0631ab79464e22d48a6a1548450b943.tar.gz | |
AVFrame: deprecate all now unused fields
| -rw-r--r-- | libavutil/frame.h | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index 5e50aae11a..adc23b2ecc 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -130,7 +130,10 @@ typedef struct AVFrame { */ enum AVPictureType pict_type; +#if FF_API_AVFRAME_LAVC + attribute_deprecated uint8_t *base[AV_NUM_DATA_POINTERS]; +#endif /** * Sample aspect ratio for the video frame, 0/1 if unknown/unspecified. @@ -166,23 +169,29 @@ typedef struct AVFrame { */ int quality; +#if FF_API_AVFRAME_LAVC + attribute_deprecated int reference; /** * QP table */ + attribute_deprecated int8_t *qscale_table; /** * QP store stride */ + attribute_deprecated int qstride; + attribute_deprecated int qscale_type; /** * mbskip_table[mb]>=1 if MB didn't change * stride= mb_width = (width+15)>>4 */ + attribute_deprecated uint8_t *mbskip_table; /** @@ -195,24 +204,29 @@ typedef struct AVFrame { * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y]; * @endcode */ + attribute_deprecated int16_t (*motion_val[2])[2]; /** * macroblock type table * mb_type_base + mb_width + 2 */ + attribute_deprecated uint32_t *mb_type; /** * DCT coefficients */ + attribute_deprecated short *dct_coeff; /** * motion reference frame index * the order in which these are stored can depend on the codec. */ + attribute_deprecated int8_t *ref_index[2]; +#endif /** * for some private data of the user @@ -224,7 +238,10 @@ typedef struct AVFrame { */ uint64_t error[AV_NUM_DATA_POINTERS]; +#if FF_API_AVFRAME_LAVC + attribute_deprecated int type; +#endif /** * When decoding, this signals how much the picture must be delayed. @@ -247,12 +264,16 @@ typedef struct AVFrame { */ int palette_has_changed; +#if FF_API_AVFRAME_LAVC + attribute_deprecated int buffer_hints; /** * Pan scan. */ + attribute_deprecated struct AVPanScan *pan_scan; +#endif /** * reordered opaque 64bit (generally an integer or a double precision float @@ -270,16 +291,19 @@ typedef struct AVFrame { * @deprecated this field is unused */ attribute_deprecated void *hwaccel_picture_private; -#endif + attribute_deprecated struct AVCodecContext *owner; + attribute_deprecated void *thread_opaque; /** * log2 of the size of the block which a single vector in motion_val represents: * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2) */ + attribute_deprecated uint8_t motion_subsample_log2; +#endif /** * Sample rate of the audio data. |