X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fsrtenc.c;h=9bb0ff94c168018c7f66709a09572a9205ad3d7f;hb=1eb311011548867b118dd461442365195fb5fb7d;hp=d811a4da0e45d1c389a1d058737d201ec6aeaceb;hpb=47e12966b75490cfa5fb8ed65a48a9a3d84a7bce;p=ffmpeg diff --git a/libavformat/srtenc.c b/libavformat/srtenc.c index d811a4da0e4..9bb0ff94c16 100644 --- a/libavformat/srtenc.c +++ b/libavformat/srtenc.c @@ -61,7 +61,8 @@ static int srt_write_packet(AVFormatContext *avf, AVPacket *pkt) SRTContext *srt = avf->priv_data; int64_t s = pkt->pts, e, d = pkt->duration; - int size, x1 = -1, y1 = -1, x2 = -1, y2 = -1; + buffer_size_t size; + int x1 = -1, y1 = -1, x2 = -1, y2 = -1; const uint8_t *p; p = av_packet_get_side_data(pkt, AV_PKT_DATA_SUBTITLE_POSITION, &size); @@ -72,13 +73,6 @@ static int srt_write_packet(AVFormatContext *avf, AVPacket *pkt) y2 = AV_RL32(p + 12); } -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - if (d <= 0) - /* For backward compatibility, fallback to convergence_duration. */ - d = pkt->convergence_duration; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (s == AV_NOPTS_VALUE || d < 0) { av_log(avf, AV_LOG_WARNING, "Insufficient timestamps in event number %d.\n", srt->index);