virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avutil/frame: Remove deprecated AVFrame.error

Browse Source 
Deprecated in 1aa24df74c.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-03-06 20:22:14 +01:00 committed by James Almer
parent 0181162bb5
commit 3b56fa85e8
6 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mpegvideo_enc.c
View File

@ -1604,13 +1604,6 @@ static void frame_end(MpegEncContext *s)
s->last_lambda_for [s->pict_type] = s->current_picture_ptr->f->quality; s->last_lambda_for [s->pict_type] = s->current_picture_ptr->f->quality;
if (s->pict_type!= AV_PICTURE_TYPE_B) if (s->pict_type!= AV_PICTURE_TYPE_B)
s->last_non_b_pict_type = s->pict_type; s->last_non_b_pict_type = s->pict_type;
#if FF_API_ERROR_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
memcpy(s->current_picture.f->error, s->current_picture.encoding_error,
sizeof(s->current_picture.encoding_error));
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
static void update_noise_reduction(MpegEncContext *s) static void update_noise_reduction(MpegEncContext *s)

6
libavcodec/snowenc.c
View File

@ -1865,12 +1865,6 @@ redo_frame:
(s->avctx->flags&AV_CODEC_FLAG_PSNR) ? 4 : 0, (s->avctx->flags&AV_CODEC_FLAG_PSNR) ? 4 : 0,
s->current_picture->pict_type); s->current_picture->pict_type);
#if FF_API_ERROR_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
memcpy(s->current_picture->error, s->encoding_error, sizeof(s->encoding_error));
FF_ENABLE_DEPRECATION_WARNINGS
#endif
pkt->size = ff_rac_terminate(c, 0); pkt->size = ff_rac_terminate(c, 0);
if (s->current_picture->key_frame) if (s->current_picture->key_frame)
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;

6
libavfilter/vf_swapuv.c
View File

@ -46,12 +46,6 @@ static void do_swap(AVFrame *frame)
FFSWAP(uint8_t*, frame->data[1], frame->data[2]); FFSWAP(uint8_t*, frame->data[1], frame->data[2]);
FFSWAP(int, frame->linesize[1], frame->linesize[2]); FFSWAP(int, frame->linesize[1], frame->linesize[2]);
FFSWAP(AVBufferRef*, frame->buf[1], frame->buf[2]); FFSWAP(AVBufferRef*, frame->buf[1], frame->buf[2]);
#if FF_API_ERROR_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
FFSWAP(uint64_t, frame->error[1], frame->error[2]);
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
static AVFrame *get_video_buffer(AVFilterLink *link, int w, int h) static AVFrame *get_video_buffer(AVFilterLink *link, int w, int h)

6
libavutil/frame.c
View File

@ -316,12 +316,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_dict_copy(&dst->metadata, src->metadata, 0); av_dict_copy(&dst->metadata, src->metadata, 0);
#if FF_API_ERROR_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
memcpy(dst->error, src->error, sizeof(dst->error));
FF_ENABLE_DEPRECATION_WARNINGS
#endif
for (i = 0; i < src->nb_side_data; i++) { for (i = 0; i < src->nb_side_data; i++) {
const AVFrameSideData *sd_src = src->side_data[i]; const AVFrameSideData *sd_src = src->side_data[i];
AVFrameSideData *sd_dst; AVFrameSideData *sd_dst;

8
libavutil/frame.h
View File

@ -434,14 +434,6 @@ typedef struct AVFrame {
*/ */
void *opaque; void *opaque;
#if FF_API_ERROR_FRAME
/**
* @deprecated unused
*/
attribute_deprecated
uint64_t error[AV_NUM_DATA_POINTERS];
#endif
/** /**
* When decoding, this signals how much the picture must be delayed. * When decoding, this signals how much the picture must be delayed.
* extra_delay = repeat_pict / (2*fps) * extra_delay = repeat_pict / (2*fps)

3
libavutil/version.h
View File

@ -105,9 +105,6 @@
* @{ * @{
*/ */
#ifndef FF_API_ERROR_FRAME
#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_PKT_PTS #ifndef FF_API_PKT_PTS
#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57) #define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57)
#endif #endif