| @@ -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 | | |
| 2107 | FF_DISABLE_DEPRECATION_WARNINGS | | |
| 2108 | picture->display_picture_number = out->picture_number; | | |
| 2109 | FF_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 | | |
| 2354 | FF_DISABLE_DEPRECATION_WARNINGS | | |
| 2355 | picture->display_picture_number = delayed_frame->picture_number; | | |
| 2356 | FF_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 | | |
| 2366 | FF_DISABLE_DEPRECATION_WARNINGS | | |
| 2367 | picture->display_picture_number = s->current_picture->picture_number; | | |
| 2368 | FF_ENABLE_DEPRECATION_WARNINGS | | |
| 2369 | #endif | | |
| 2370 | *got_frame = 1; | 2355 | *got_frame = 1; |
| 2371 | } | 2356 | } |
| 2372 | | 2357 | |