History

avutil: remove deprecated FF_API_FRAME_PICTURE_NUMBER

James Almer committed 2 years ago

Commit 583cf2a1 parent 67e7f0b27 files · +97 −247Browse files

Showing the changes to libavcodec (4 of 27 files). Show all

Unified · Split

4 files
  1. libavcodec/diracdec.c +0 −15
  2. libavcodec/h264_slice.c +0 −5
  3. libavcodec/libuavs3d.c +0 −6
  4. libavcodec/mpegvideo_dec.c +0 −6
libavcodec/diracdec.c+0−15
@@ -2103,11 +2103,6 @@ static int get_delayed_pic(DiracContext *s, AVFrame *picture, int *got_frame) · 2102 unmodified lines
21032103 out->reference ^= DELAYED_PIC_REF;
21042104 if((ret = av_frame_ref(picture, out->avframe)) < 0)
21052105 return ret;
2106−#if FF_API_FRAME_PICTURE_NUMBER
2107−FF_DISABLE_DEPRECATION_WARNINGS
2108− picture->display_picture_number = out->picture_number;
2109−FF_ENABLE_DEPRECATION_WARNINGS
2110−#endif
21112106 *got_frame = 1;
21122107 }
21132108
@@ -2350,11 +2345,6 @@ static int dirac_decode_frame(AVCodecContext *avctx, AVFrame *picture, · 236 unmodified lines
23502345 if((ret = av_frame_ref(picture, delayed_frame->avframe)) < 0)
23512346 return ret;
23522347 s->frame_number = delayed_frame->picture_number + 1LL;
2353−#if FF_API_FRAME_PICTURE_NUMBER
2354−FF_DISABLE_DEPRECATION_WARNINGS
2355− picture->display_picture_number = delayed_frame->picture_number;
2356−FF_ENABLE_DEPRECATION_WARNINGS
2357−#endif
23582348 *got_frame = 1;
23592349 }
23602350 } else if (s->current_picture->picture_number == s->frame_number) {
@@ -2362,11 +2352,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 1 unmodified line
23622352 if((ret = av_frame_ref(picture, s->current_picture->avframe)) < 0)
23632353 return ret;
23642354 s->frame_number = s->current_picture->picture_number + 1LL;
2365−#if FF_API_FRAME_PICTURE_NUMBER
2366−FF_DISABLE_DEPRECATION_WARNINGS
2367− picture->display_picture_number = s->current_picture->picture_number;
2368−FF_ENABLE_DEPRECATION_WARNINGS
2369−#endif
23702355 *got_frame = 1;
23712356 }
23722357
libavcodec/h264_slice.c+0−5
@@ -496,11 +496,6 @@ static int h264_frame_start(H264Context *h) · 495 unmodified lines
496496 pic = &h->DPB[i];
497497
498498 pic->reference = h->droppable ? 0 : h->picture_structure;
499−#if FF_API_FRAME_PICTURE_NUMBER
500−FF_DISABLE_DEPRECATION_WARNINGS
501− pic->f->coded_picture_number = h->coded_picture_number++;
502−FF_ENABLE_DEPRECATION_WARNINGS
503−#endif
504499 pic->field_picture = h->picture_structure != PICT_FRAME;
505500 pic->frame_num = h->poc.frame_num;
506501 /*
libavcodec/libuavs3d.c+0−6
@@ -84,12 +84,6 @@ FF_DISABLE_DEPRECATION_WARNINGS · 83 unmodified lines
8484 frm->pkt_pos = dec_frame->pkt_pos;
8585 frm->pkt_size = dec_frame->pkt_size;
8686 FF_ENABLE_DEPRECATION_WARNINGS
87−#endif
88−#if FF_API_FRAME_PICTURE_NUMBER
89−FF_DISABLE_DEPRECATION_WARNINGS
90− frm->coded_picture_number = dec_frame->dtr;
91− frm->display_picture_number = dec_frame->ptr;
92−FF_ENABLE_DEPRECATION_WARNINGS
9387 #endif
9488
9589 if (dec_frame->type < 0 || dec_frame->type >= FF_ARRAY_ELEMS(ff_avs3_image_type)) {
libavcodec/mpegvideo_dec.c+0−6
@@ -344,12 +344,6 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) · 343 unmodified lines
344344 pic->reference = 3;
345345 }
346346
347−#if FF_API_FRAME_PICTURE_NUMBER
348−FF_DISABLE_DEPRECATION_WARNINGS
349− pic->f->coded_picture_number = s->coded_picture_number++;
350−FF_ENABLE_DEPRECATION_WARNINGS
351−#endif
352−
353347 if (alloc_picture(s, pic) < 0)
354348 return -1;
355349

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