diff options
author | Clément Bœsch <u@pkh.me> | 2015-09-10 21:40:07 +0200 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2015-09-10 21:40:07 +0200 |
commit | af924fd9e469064707fc00212456952b3e62ee5e (patch) | |
tree | 8c0fc8cd72d58a8a1de16d28d72fb2853462b9ca /libavformat/subtitles.c | |
parent | a634649a36d8ed6a3fb29b4cdfb7023f7338c824 (diff) | |
download | ffmpeg-af924fd9e469064707fc00212456952b3e62ee5e.tar.gz |
avformat/subtitles: forward log context in ff_subtitles_queue_finalize() for logging
Diffstat (limited to 'libavformat/subtitles.c')
-rw-r--r-- | libavformat/subtitles.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c index 2f8b066cd9..192043f917 100644 --- a/libavformat/subtitles.c +++ b/libavformat/subtitles.c @@ -166,7 +166,7 @@ static int cmp_pkt_sub_pos_ts(const void *a, const void *b) return s1->pos > s2->pos ? 1 : -1; } -static void drop_dups(FFDemuxSubtitlesQueue *q) +static void drop_dups(void *log_ctx, FFDemuxSubtitlesQueue *q) { int i, drop = 0; @@ -189,13 +189,11 @@ static void drop_dups(FFDemuxSubtitlesQueue *q) if (drop) { q->nb_subs -= drop; - - // TODO: forward log context down here - av_log(NULL, AV_LOG_WARNING, "Dropping %d duplicated subtitle events\n", drop); + av_log(log_ctx, AV_LOG_WARNING, "Dropping %d duplicated subtitle events\n", drop); } } -void ff_subtitles_queue_finalize(FFDemuxSubtitlesQueue *q) +void ff_subtitles_queue_finalize(void *log_ctx, FFDemuxSubtitlesQueue *q) { int i; @@ -205,7 +203,8 @@ void ff_subtitles_queue_finalize(FFDemuxSubtitlesQueue *q) for (i = 0; i < q->nb_subs; i++) if (q->subs[i].duration == -1 && i < q->nb_subs - 1) q->subs[i].duration = q->subs[i + 1].pts - q->subs[i].pts; - drop_dups(q); + + drop_dups(log_ctx, q); } int ff_subtitles_queue_read_packet(FFDemuxSubtitlesQueue *q, AVPacket *pkt) |