From e2ecf3d03d5e5667fe7c28bee3c14c67eb447a5c Mon Sep 17 00:00:00 2001 From: shdown Date: Sat, 30 Aug 2014 14:03:57 +0400 Subject: demux_mkv: eliminate redundant branch In the else branch pict_type is always 3, so pict_type != 3 is always false. (Note that I have no idea of what it was supposed to do and it is just an equivalent of the old behaviour.) --- demux/demux_mkv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'demux/demux_mkv.c') diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 5e2e0f904f..02efcb2a0a 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -1952,11 +1952,7 @@ static int64_t real_fix_timestamp(unsigned char *buf, int len, int64_t timestamp *kf_base = timestamp; *kf_pts = pts; } else { - if (pict_type != 3) { - timestamp = *kf_base + ((pts - *kf_pts) & 0x1FFF); - } else { - timestamp = *kf_base - ((*kf_pts - pts) & 0x1FFF); - } + timestamp = *kf_base - ((*kf_pts - pts) & 0x1FFF); } return timestamp; -- cgit v1.2.3