avcodec: remove deprecated FF_API_TICKS_PER_FRAME

Deprecated since 2023-05-15.

James Almer committed 1 year ago

Commit 7d077231 parent c29a1cb28 files · +16 −210Browse files

Showing the changes to libavformat (2 of 28 files). Show all

Unified · Split

2 files

                                                    : (ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO ? (AVRational){0, 1}
                                                                                                       : ist->time_base);
     AVRational enc_tb = ist->time_base;
-#if FF_API_TICKS_PER_FRAME
-FF_DISABLE_DEPRECATION_WARNINGS
-    int ticks_per_frame = dec_ctx ? dec_ctx->ticks_per_frame : 1;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
     /*
      * Avi is a special case here because it supports variable fps but
                        (dec_ctx_framerate.num || ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO))) {
             enc_tb = dec_ctx_tb;
             enc_tb.den *= 2;
-#if FF_API_TICKS_PER_FRAME
-            enc_tb.num *= ticks_per_frame;
-#endif
         }
     } else if (!(ofmt->flags & AVFMT_VARIABLE_FPS)
                && !av_match_name(ofmt->name, "mov,mp4,3gp,3g2,psp,ipod,ismv,f4v")) {
             || (copy_tb == AVFMT_TBCF_DECODER &&
                 (dec_ctx_framerate.num || ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO))) {
             enc_tb = dec_ctx_tb;
-#if FF_API_TICKS_PER_FRAME
-            enc_tb.num *= ticks_per_frame;
-#endif
         }
     }

     avctx_new->pkt_timebase = sti->avctx->pkt_timebase;
-#if FF_API_TICKS_PER_FRAME
-FF_DISABLE_DEPRECATION_WARNINGS
-    avctx_new->ticks_per_frame = sti->avctx->ticks_per_frame;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
     avcodec_free_context(&sti->avctx);
     sti->avctx = avctx_new;

Keyboard shortcuts