History

avutil/frame: Remove deprecated AVFrame.error

Deprecated in 1aa24df74c052a73175c43e57d35b4835e537ec8.

Andreas Rheinhardt committed 5 years ago

Commit 3b56fa81 parent 01811626 files · +0 −36Browse files

Unified · Split

6 files
  1. libavcodec/mpegvideo_enc.c +0 −7
  2. libavcodec/snowenc.c +0 −6
  3. libavfilter/vf_swapuv.c +0 −6
  4. libavutil/frame.c +0 −6
  5. libavutil/frame.h +0 −8
  6. libavutil/version.h +0 −3
libavcodec/mpegvideo_enc.c+0−7
@@ -1604,13 +1604,6 @@ static void frame_end(MpegEncContext *s) · 1603 unmodified lines
1604 s->last_lambda_for [s->pict_type] = s->current_picture_ptr->f->quality;1604 s->last_lambda_for [s->pict_type] = s->current_picture_ptr->f->quality;
1605 if (s->pict_type!= AV_PICTURE_TYPE_B)1605 if (s->pict_type!= AV_PICTURE_TYPE_B)
1606 s->last_non_b_pict_type = s->pict_type;1606 s->last_non_b_pict_type = s->pict_type;
1607
1608#if FF_API_ERROR_FRAME
1609FF_DISABLE_DEPRECATION_WARNINGS
1610 memcpy(s->current_picture.f->error, s->current_picture.encoding_error,
1611 sizeof(s->current_picture.encoding_error));
1612FF_ENABLE_DEPRECATION_WARNINGS
1613#endif
1614}1607}
1615 1608
1616static void update_noise_reduction(MpegEncContext *s)1609static void update_noise_reduction(MpegEncContext *s)
libavcodec/snowenc.c+0−6
@@ -1865,12 +1865,6 @@ redo_frame: · 1864 unmodified lines
1865 (s->avctx->flags&AV_CODEC_FLAG_PSNR) ? 4 : 0,1865 (s->avctx->flags&AV_CODEC_FLAG_PSNR) ? 4 : 0,
1866 s->current_picture->pict_type);1866 s->current_picture->pict_type);
1867 1867
1868#if FF_API_ERROR_FRAME
1869FF_DISABLE_DEPRECATION_WARNINGS
1870 memcpy(s->current_picture->error, s->encoding_error, sizeof(s->encoding_error));
1871FF_ENABLE_DEPRECATION_WARNINGS
1872#endif
1873
1874 pkt->size = ff_rac_terminate(c, 0);1868 pkt->size = ff_rac_terminate(c, 0);
1875 if (s->current_picture->key_frame)1869 if (s->current_picture->key_frame)
1876 pkt->flags |= AV_PKT_FLAG_KEY;1870 pkt->flags |= AV_PKT_FLAG_KEY;
libavfilter/vf_swapuv.c+0−6
@@ -46,12 +46,6 @@ static void do_swap(AVFrame *frame) · 45 unmodified lines
46 FFSWAP(uint8_t*, frame->data[1], frame->data[2]);46 FFSWAP(uint8_t*, frame->data[1], frame->data[2]);
47 FFSWAP(int, frame->linesize[1], frame->linesize[2]);47 FFSWAP(int, frame->linesize[1], frame->linesize[2]);
48 FFSWAP(AVBufferRef*, frame->buf[1], frame->buf[2]);48 FFSWAP(AVBufferRef*, frame->buf[1], frame->buf[2]);
49
50#if FF_API_ERROR_FRAME
51FF_DISABLE_DEPRECATION_WARNINGS
52 FFSWAP(uint64_t, frame->error[1], frame->error[2]);
53FF_ENABLE_DEPRECATION_WARNINGS
54#endif
55}49}
56 50
57static AVFrame *get_video_buffer(AVFilterLink *link, int w, int h)51static AVFrame *get_video_buffer(AVFilterLink *link, int w, int h)
libavutil/frame.c+0−6
@@ -316,12 +316,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 315 unmodified lines
316 316
317 av_dict_copy(&dst->metadata, src->metadata, 0);317 av_dict_copy(&dst->metadata, src->metadata, 0);
318 318
319#if FF_API_ERROR_FRAME
320FF_DISABLE_DEPRECATION_WARNINGS
321 memcpy(dst->error, src->error, sizeof(dst->error));
322FF_ENABLE_DEPRECATION_WARNINGS
323#endif
324
325 for (i = 0; i < src->nb_side_data; i++) {319 for (i = 0; i < src->nb_side_data; i++) {
326 const AVFrameSideData *sd_src = src->side_data[i];320 const AVFrameSideData *sd_src = src->side_data[i];
327 AVFrameSideData *sd_dst;321 AVFrameSideData *sd_dst;
libavutil/frame.h+0−8
@@ -434,14 +434,6 @@ typedef struct AVFrame { · 433 unmodified lines
434 */434 */
435 void *opaque;435 void *opaque;
436 436
437#if FF_API_ERROR_FRAME
438 /**
439 * @deprecated unused
440 */
441 attribute_deprecated
442 uint64_t error[AV_NUM_DATA_POINTERS];
443#endif
444
445 /**437 /**
446 * When decoding, this signals how much the picture must be delayed.438 * When decoding, this signals how much the picture must be delayed.
447 * extra_delay = repeat_pict / (2*fps)439 * extra_delay = repeat_pict / (2*fps)
libavutil/version.h+0−3
@@ -105,9 +105,6 @@ · 104 unmodified lines
105 * @{105 * @{
106 */106 */
107 107
108#ifndef FF_API_ERROR_FRAME
109#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 57)
110#endif
111#ifndef FF_API_PKT_PTS108#ifndef FF_API_PKT_PTS
112#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57)109#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57)
113#endif110#endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t