avutil: remove deprecated FF_API_FRAME_PICTURE_NUMBER

Signed-off-by: James Almer <jamrial@gmail.com>

doc/ffprobe.xsd

@@ -126,8 +126,6 @@
     <xsd:attribute name="pix_fmt"                type="xsd:string"/>
     <xsd:attribute name="sample_aspect_ratio"    type="xsd:string"/>
     <xsd:attribute name="pict_type"              type="xsd:string"/>
-    <xsd:attribute name="coded_picture_number"   type="xsd:long"  />
-    <xsd:attribute name="display_picture_number" type="xsd:long"  />
     <xsd:attribute name="interlaced_frame"       type="xsd:int"   />
     <xsd:attribute name="top_field_first"        type="xsd:int"   />
     <xsd:attribute name="repeat_pict"            type="xsd:int"   />

fftools/ffprobe.c

@@ -2805,12 +2805,6 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream,
             print_str_opt("sample_aspect_ratio", "N/A");
         }
         print_fmt("pict_type",              "%c", av_get_picture_type_char(frame->pict_type));
-#if LIBAVUTIL_VERSION_MAJOR < 59
-    AV_NOWARN_DEPRECATED(
-        print_int("coded_picture_number",   frame->coded_picture_number);
-        print_int("display_picture_number", frame->display_picture_number);
-    )
-#endif
         print_int("interlaced_frame",       !!(frame->flags & AV_FRAME_FLAG_INTERLACED));
         print_int("top_field_first",        !!(frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST));
         print_int("repeat_pict",            frame->repeat_pict);

libavcodec/diracdec.c

@@ -2103,11 +2103,6 @@ static int get_delayed_pic(DiracContext *s, AVFrame *picture, int *got_frame)
         out->reference ^= DELAYED_PIC_REF;
         if((ret = av_frame_ref(picture, out->avframe)) < 0)
             return ret;
-#if FF_API_FRAME_PICTURE_NUMBER
-FF_DISABLE_DEPRECATION_WARNINGS
-        picture->display_picture_number = out->picture_number;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
         *got_frame = 1;
     }
 
@@ -2350,11 +2345,6 @@ static int dirac_decode_frame(AVCodecContext *avctx, AVFrame *picture,
             if((ret = av_frame_ref(picture, delayed_frame->avframe)) < 0)
                 return ret;
             s->frame_number = delayed_frame->picture_number + 1LL;
-#if FF_API_FRAME_PICTURE_NUMBER
-FF_DISABLE_DEPRECATION_WARNINGS
-            picture->display_picture_number = delayed_frame->picture_number;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
             *got_frame = 1;
         }
     } else if (s->current_picture->picture_number == s->frame_number) {
@@ -2362,11 +2352,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
         if((ret = av_frame_ref(picture, s->current_picture->avframe)) < 0)
             return ret;
         s->frame_number = s->current_picture->picture_number + 1LL;
-#if FF_API_FRAME_PICTURE_NUMBER
-FF_DISABLE_DEPRECATION_WARNINGS
-        picture->display_picture_number = s->current_picture->picture_number;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
         *got_frame = 1;
     }
 

libavcodec/h264_slice.c

@@ -496,11 +496,6 @@ static int h264_frame_start(H264Context *h)
     pic = &h->DPB[i];
 
     pic->reference              = h->droppable ? 0 : h->picture_structure;
-#if FF_API_FRAME_PICTURE_NUMBER
-FF_DISABLE_DEPRECATION_WARNINGS
-    pic->f->coded_picture_number = h->coded_picture_number++;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
     pic->field_picture          = h->picture_structure != PICT_FRAME;
     pic->frame_num               = h->poc.frame_num;
     /*

libavcodec/libuavs3d.c

@@ -84,12 +84,6 @@ FF_DISABLE_DEPRECATION_WARNINGS
     frm->pkt_pos   = dec_frame->pkt_pos;
     frm->pkt_size  = dec_frame->pkt_size;
 FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-#if FF_API_FRAME_PICTURE_NUMBER
-FF_DISABLE_DEPRECATION_WARNINGS
-    frm->coded_picture_number   = dec_frame->dtr;
-    frm->display_picture_number = dec_frame->ptr;
-FF_ENABLE_DEPRECATION_WARNINGS
 #endif
 
     if (dec_frame->type < 0 || dec_frame->type >= FF_ARRAY_ELEMS(ff_avs3_image_type)) {

libavcodec/mpegvideo_dec.c

@@ -344,12 +344,6 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx)
             pic->reference = 3;
     }
 
-#if FF_API_FRAME_PICTURE_NUMBER
-FF_DISABLE_DEPRECATION_WARNINGS
-    pic->f->coded_picture_number = s->coded_picture_number++;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
     if (alloc_picture(s, pic) < 0)
         return -1;
 

libavutil/frame.c

@@ -268,12 +268,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
     dst->time_base              = src->time_base;
     dst->quality                = src->quality;
     dst->best_effort_timestamp  = src->best_effort_timestamp;
-#if FF_API_FRAME_PICTURE_NUMBER
-FF_DISABLE_DEPRECATION_WARNINGS
-    dst->coded_picture_number   = src->coded_picture_number;
-    dst->display_picture_number = src->display_picture_number;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
     dst->flags                  = src->flags;
     dst->decode_error_flags     = src->decode_error_flags;
     dst->color_primaries        = src->color_primaries;

libavutil/frame.h

@@ -466,19 +466,6 @@ typedef struct AVFrame {
      */
     AVRational time_base;
 
-#if FF_API_FRAME_PICTURE_NUMBER
-    /**
-     * picture number in bitstream order
-     */
-    attribute_deprecated
-    int coded_picture_number;
-    /**
-     * picture number in display order
-     */
-    attribute_deprecated
-    int display_picture_number;
-#endif
-
     /**
      * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
      */

libavutil/version.h

@@ -105,7 +105,6 @@
  * @{
  */
 
-#define FF_API_FRAME_PICTURE_NUMBER     (LIBAVUTIL_VERSION_MAJOR < 59)
 #define FF_API_HDR_VIVID_THREE_SPLINE   (LIBAVUTIL_VERSION_MAJOR < 59)
 #define FF_API_FRAME_PKT                (LIBAVUTIL_VERSION_MAJOR < 59)
 #define FF_API_INTERLACED_FRAME         (LIBAVUTIL_VERSION_MAJOR < 59)

tests/ref/fate/exif-image-embedded

@@ -21,8 +21,6 @@ crop_right=0
 pix_fmt=yuvj420p
 sample_aspect_ratio=1:1
 pict_type=I
-coded_picture_number=0
-display_picture_number=0
 interlaced_frame=0
 top_field_first=0
 repeat_pict=0