Deprecated since 2023-05-15.
Showing the changes to libavformat (2 of 28 files). Show all
Unified · Split
| @@ -797,11 +797,6 @@ int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt, · 796 unmodified lines | ||
| 797 | 797 | : (ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO ? (AVRational){0, 1} |
| 798 | 798 | : ist->time_base); |
| 799 | 799 | AVRational enc_tb = ist->time_base; |
| 800 | −#if FF_API_TICKS_PER_FRAME | |
| 801 | −FF_DISABLE_DEPRECATION_WARNINGS | |
| 802 | − int ticks_per_frame = dec_ctx ? dec_ctx->ticks_per_frame : 1; | |
| 803 | −FF_ENABLE_DEPRECATION_WARNINGS | |
| 804 | −#endif | |
| 805 | 800 | |
| 806 | 801 | /* |
| 807 | 802 | * Avi is a special case here because it supports variable fps but |
| @@ -827,9 +822,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 19 unmodified lines | ||
| 827 | 822 | (dec_ctx_framerate.num || ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO))) { |
| 828 | 823 | enc_tb = dec_ctx_tb; |
| 829 | 824 | enc_tb.den *= 2; |
| 830 | −#if FF_API_TICKS_PER_FRAME | |
| 831 | − enc_tb.num *= ticks_per_frame; | |
| 832 | −#endif | |
| 833 | 825 | } |
| 834 | 826 | } else if (!(ofmt->flags & AVFMT_VARIABLE_FPS) |
| 835 | 827 | && !av_match_name(ofmt->name, "mov,mp4,3gp,3g2,psp,ipod,ismv,f4v")) { |
| @@ -839,9 +831,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 3 unmodified lines | ||
| 839 | 831 | || (copy_tb == AVFMT_TBCF_DECODER && |
| 840 | 832 | (dec_ctx_framerate.num || ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO))) { |
| 841 | 833 | enc_tb = dec_ctx_tb; |
| 842 | −#if FF_API_TICKS_PER_FRAME | |
| 843 | − enc_tb.num *= ticks_per_frame; | |
| 844 | −#endif | |
| 845 | 834 | } |
| 846 | 835 | } |
| 847 | 836 | |
| @@ -1317,12 +1317,6 @@ static int codec_close(FFStream *sti) · 1316 unmodified lines | ||
| 1317 | 1317 | |
| 1318 | 1318 | avctx_new->pkt_timebase = sti->avctx->pkt_timebase; |
| 1319 | 1319 | |
| 1320 | −#if FF_API_TICKS_PER_FRAME | |
| 1321 | −FF_DISABLE_DEPRECATION_WARNINGS | |
| 1322 | − avctx_new->ticks_per_frame = sti->avctx->ticks_per_frame; | |
| 1323 | −FF_ENABLE_DEPRECATION_WARNINGS | |
| 1324 | −#endif | |
| 1325 | − | |
| 1326 | 1320 | avcodec_free_context(&sti->avctx); |
| 1327 | 1321 | sti->avctx = avctx_new; |
| 1328 | 1322 | |