RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-27 09:32:40 +00:00
Code Issues Releases Wiki Activity

sd_lavc: remove ineffective code

Browse Source 
It makes no sense to set the packet duration, because libavcodec doesn't
know the timebase. And in fact, no subtitle decoder accesses the packet
duration, except text subtitle converters, which are not relevant here.
So this code did nothing - drop it.

Also fix a blatantly incorrect comment.
This commit is contained in:
wm4 2014-08-24 12:26:34 +02:00
parent 1cedb323ad
commit 2c114db2f1
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sub/sd_lavc.c
View File

@ -47,7 +47,7 @@ struct sub {
struct sd_lavc_priv {
AVCodecContext *avctx;
struct sub subs[MAX_QUEUE]; // lowest pts first
struct sub subs[MAX_QUEUE]; // most recent event first
struct sub_bitmap *outbitmaps;
int64_t displayed_id;
int64_t new_id;
@ -204,9 +204,6 @@ static void decode(struct sd *sd, struct demux_packet *packet)
av_init_packet(&pkt);
pkt.data = packet->buffer;
pkt.size = packet->len;
pkt.pts = AV_NOPTS_VALUE;
if (duration >= 0)
pkt.convergence_duration = duration * 1000;
int got_sub;
int res = avcodec_decode_subtitle2(ctx, &sub, &got_sub, &pkt);
if (res < 0 || !got_sub)