Skip to content

F
ffmpeg
Commit a9e48177 authored by Nicolas George's avatar Nicolas George
Browse files
Options

ffmpeg: use PTS from the AVSubtitle structure for sub2video.

parent 2939e258
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
ffmpeg.c
View file @ a9e48177
...@@ -202,13 +202,14 @@ static void sub2video_push_ref(InputStream *ist, int64_t pts) ...@@ -202,13 +202,14 @@ static void sub2video_push_ref(InputStream *ist, int64_t pts)
AV_BUFFERSRC_FLAG_PUSH); AV_BUFFERSRC_FLAG_PUSH);
} }
static void sub2video_update(InputStream *ist, AVSubtitle *sub, int64_t pts) static void sub2video_update(InputStream *ist, AVSubtitle *sub)
{ {
int w = ist->sub2video.w, h = ist->sub2video.h; int w = ist->sub2video.w, h = ist->sub2video.h;
AVFilterBufferRef *ref = ist->sub2video.ref; AVFilterBufferRef *ref = ist->sub2video.ref;
int8_t *dst; int8_t *dst;
int dst_linesize; int dst_linesize;
int i; int i;
int64_t pts = av_rescale_q(sub->pts, AV_TIME_BASE_Q, ist->st->time_base);
if (!ref) if (!ref)
return; return;
...@@ -1680,7 +1681,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output) ...@@ -1680,7 +1681,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
FFSWAP(AVSubtitle, subtitle, ist->prev_sub.subtitle); FFSWAP(AVSubtitle, subtitle, ist->prev_sub.subtitle);
} }
sub2video_update(ist, &subtitle, pkt->pts); sub2video_update(ist, &subtitle);
if (!*got_output || !subtitle.num_rects) if (!*got_output || !subtitle.num_rects)
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment