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
2103 out->reference ^= DELAYED_PIC_REF;2103 out->reference ^= DELAYED_PIC_REF;
2104 if((ret = av_frame_ref(picture, out->avframe)) < 0)2104 if((ret = av_frame_ref(picture, out->avframe)) < 0)
2105 return ret;2105 return ret;
2106#if FF_API_FRAME_PICTURE_NUMBER
2107FF_DISABLE_DEPRECATION_WARNINGS
2108 picture->display_picture_number = out->picture_number;
2109FF_ENABLE_DEPRECATION_WARNINGS
2110#endif
2111 *got_frame = 1;2106 *got_frame = 1;
2112 }2107 }
2113 2108
@@ -2350,11 +2345,6 @@ static int dirac_decode_frame(AVCodecContext *avctx, AVFrame *picture, · 236 unmodified lines
2350 if((ret = av_frame_ref(picture, delayed_frame->avframe)) < 0)2345 if((ret = av_frame_ref(picture, delayed_frame->avframe)) < 0)
2351 return ret;2346 return ret;
2352 s->frame_number = delayed_frame->picture_number + 1LL;2347 s->frame_number = delayed_frame->picture_number + 1LL;
2353#if FF_API_FRAME_PICTURE_NUMBER
2354FF_DISABLE_DEPRECATION_WARNINGS
2355 picture->display_picture_number = delayed_frame->picture_number;
2356FF_ENABLE_DEPRECATION_WARNINGS
2357#endif
2358 *got_frame = 1;2348 *got_frame = 1;
2359 }2349 }
2360 } else if (s->current_picture->picture_number == s->frame_number) {2350 } else if (s->current_picture->picture_number == s->frame_number) {
@@ -2362,11 +2352,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 1 unmodified line
2362 if((ret = av_frame_ref(picture, s->current_picture->avframe)) < 0)2352 if((ret = av_frame_ref(picture, s->current_picture->avframe)) < 0)
2363 return ret;2353 return ret;
2364 s->frame_number = s->current_picture->picture_number + 1LL;2354 s->frame_number = s->current_picture->picture_number + 1LL;
2365#if FF_API_FRAME_PICTURE_NUMBER
2366FF_DISABLE_DEPRECATION_WARNINGS
2367 picture->display_picture_number = s->current_picture->picture_number;
2368FF_ENABLE_DEPRECATION_WARNINGS
2369#endif
2370 *got_frame = 1;2355 *got_frame = 1;
2371 }2356 }
2372 2357
libavcodec/h264_slice.c+0−5
@@ -496,11 +496,6 @@ static int h264_frame_start(H264Context *h) · 495 unmodified lines
496 pic = &h->DPB[i];496 pic = &h->DPB[i];
497 497
498 pic->reference = h->droppable ? 0 : h->picture_structure;498 pic->reference = h->droppable ? 0 : h->picture_structure;
499#if FF_API_FRAME_PICTURE_NUMBER
500FF_DISABLE_DEPRECATION_WARNINGS
501 pic->f->coded_picture_number = h->coded_picture_number++;
502FF_ENABLE_DEPRECATION_WARNINGS
503#endif
504 pic->field_picture = h->picture_structure != PICT_FRAME;499 pic->field_picture = h->picture_structure != PICT_FRAME;
505 pic->frame_num = h->poc.frame_num;500 pic->frame_num = h->poc.frame_num;
506 /*501 /*
libavcodec/libuavs3d.c+0−6
@@ -84,12 +84,6 @@ FF_DISABLE_DEPRECATION_WARNINGS · 83 unmodified lines
84 frm->pkt_pos = dec_frame->pkt_pos;84 frm->pkt_pos = dec_frame->pkt_pos;
85 frm->pkt_size = dec_frame->pkt_size;85 frm->pkt_size = dec_frame->pkt_size;
86FF_ENABLE_DEPRECATION_WARNINGS86FF_ENABLE_DEPRECATION_WARNINGS
87#endif
88#if FF_API_FRAME_PICTURE_NUMBER
89FF_DISABLE_DEPRECATION_WARNINGS
90 frm->coded_picture_number = dec_frame->dtr;
91 frm->display_picture_number = dec_frame->ptr;
92FF_ENABLE_DEPRECATION_WARNINGS
93#endif87#endif
94 88
95 if (dec_frame->type < 0 || dec_frame->type >= FF_ARRAY_ELEMS(ff_avs3_image_type)) {89 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
344 pic->reference = 3;344 pic->reference = 3;
345 }345 }
346 346
347#if FF_API_FRAME_PICTURE_NUMBER
348FF_DISABLE_DEPRECATION_WARNINGS
349 pic->f->coded_picture_number = s->coded_picture_number++;
350FF_ENABLE_DEPRECATION_WARNINGS
351#endif
352
353 if (alloc_picture(s, pic) < 0)347 if (alloc_picture(s, pic) < 0)
354 return -1;348 return -1;
355 349

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