From: Hendrik Leppkes Date: Sat, 5 Sep 2015 15:31:45 +0000 (+0200) Subject: Merge commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79' X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b9fd813351733b867fb73219e33b1f4845b40dde;hp=f1b02e6ca88909f428d4a690c47620575853b647;p=ffmpeg Merge commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79' * commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79': lavu: Drop deprecated duplicated AVFrame/AVCodecContext parameters Merged-by: Hendrik Leppkes --- diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 6a918e904a7..22aeca361fe 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3780,39 +3780,6 @@ const AVClass *avcodec_get_subtitle_rect_class(void); */ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src); -#if FF_API_AVFRAME_LAVC -/** - * @deprecated use av_frame_alloc() - */ -attribute_deprecated -AVFrame *avcodec_alloc_frame(void); - -/** - * Set the fields of the given AVFrame to default values. - * - * @param frame The AVFrame of which the fields should be set to default values. - * - * @deprecated use av_frame_unref() - */ -attribute_deprecated -void avcodec_get_frame_defaults(AVFrame *frame); - -/** - * Free the frame and any dynamically allocated objects in it, - * e.g. extended_data. - * - * @param frame frame to be freed. The pointer will be set to NULL. - * - * @warning this function does NOT free the data buffers themselves - * (it does not know how, since they might have been allocated with - * a custom get_buffer()). - * - * @deprecated use av_frame_free() - */ -attribute_deprecated -void avcodec_free_frame(AVFrame **frame); -#endif - /** * Initialize the AVCodecContext to use the given AVCodec. Prior to using this * function the context has to be allocated with avcodec_alloc_context3(). diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 18d86e3385d..cfc561346f0 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1096,31 +1096,6 @@ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt) return ret; } -#if FF_API_AVFRAME_LAVC -void avcodec_get_frame_defaults(AVFrame *frame) -{ -#if LIBAVCODEC_VERSION_MAJOR >= 55 - // extended_data should explicitly be freed when needed, this code is unsafe currently - // also this is not compatible to the <55 ABI/API - if (frame->extended_data != frame->data && 0) - av_freep(&frame->extended_data); -#endif - - memset(frame, 0, sizeof(AVFrame)); - av_frame_unref(frame); -} - -AVFrame *avcodec_alloc_frame(void) -{ - return av_frame_alloc(); -} - -void avcodec_free_frame(AVFrame **frame) -{ - av_frame_free(frame); -} -#endif - MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase) MAKE_ACCESSORS(AVCodecContext, codec, const AVCodecDescriptor *, codec_descriptor) MAKE_ACCESSORS(AVCodecContext, codec, int, lowres) diff --git a/libavutil/frame.c b/libavutil/frame.c index 3a84811b874..f403fd75ddf 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -289,11 +289,6 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) dst->palette_has_changed = src->palette_has_changed; dst->sample_rate = src->sample_rate; dst->opaque = src->opaque; -#if FF_API_AVFRAME_LAVC -FF_DISABLE_DEPRECATION_WARNINGS - dst->type = src->type; -FF_ENABLE_DEPRECATION_WARNINGS -#endif dst->pkt_pts = src->pkt_pts; dst->pkt_dts = src->pkt_dts; dst->pkt_pos = src->pkt_pos; diff --git a/libavutil/frame.h b/libavutil/frame.h index 196b578af4c..f5e89376bad 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -241,11 +241,6 @@ 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. */ @@ -282,64 +277,6 @@ 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; - - /** - * motion vector table - * @code - * example: - * int mv_sample_log2= 4 - motion_subsample_log2; - * int mb_width= (width+15)>>4; - * int mv_stride= (mb_width << mv_sample_log2) + 1; - * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y]; - * @endcode - */ - 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 */ @@ -350,11 +287,6 @@ 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. * extra_delay = repeat_pict / (2*fps) @@ -376,17 +308,6 @@ 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 * PTS but can be anything). @@ -398,24 +319,6 @@ typedef struct AVFrame { */ int64_t reordered_opaque; -#if FF_API_AVFRAME_LAVC - /** - * @deprecated this field is unused - */ - attribute_deprecated void *hwaccel_picture_private; - - 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) - */ - uint8_t motion_subsample_log2; -#endif - /** * Sample rate of the audio data. */ @@ -574,6 +477,22 @@ typedef struct AVFrame { */ int pkt_size; + /** + * QP table + * Not to be accessed directly from outside libavutil + */ + attribute_deprecated + int8_t *qscale_table; + /** + * QP store stride + * Not to be accessed directly from outside libavutil + */ + attribute_deprecated + int qstride; + + attribute_deprecated + int qscale_type; + /** * Not to be accessed directly from outside libavutil */ diff --git a/libavutil/version.h b/libavutil/version.h index 8b7d34940d7..9fbdc7227c9 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -93,9 +93,6 @@ #ifndef FF_API_LLS_PRIVATE #define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55) #endif -#ifndef FF_API_AVFRAME_LAVC -#define FF_API_AVFRAME_LAVC (LIBAVUTIL_VERSION_MAJOR < 55) -#endif #ifndef FF_API_VDPAU #define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 55) #endif