summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-25 14:33:19 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-25 14:33:19 +0000
commit72fa22f6b03b1b43f09e47d1aafd2a4551735402 (patch)
tree01509cc32b33fe956dd649b7da2747b18436253a
parentbc389eee92881241594ac84197eb516ffdacc6d5 (diff)
downloadmpv-72fa22f6b03b1b43f09e47d1aafd2a4551735402.tar.bz2
mpv-72fa22f6b03b1b43f09e47d1aafd2a4551735402.tar.xz
cosmetics: reindented
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22341 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/muxer_mpeg.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c
index 1521dc4010..594fb82f96 100644
--- a/libmpdemux/muxer_mpeg.c
+++ b/libmpdemux/muxer_mpeg.c
@@ -1695,19 +1695,17 @@ static size_t parse_mpeg12_video(muxer_stream_t *s, muxer_priv_t *priv, muxer_he
spriv->last_tr = spriv->max_tr = temp_ref;
d1 = temp_ref - spriv->last_tr;
if(gop_reset)
- {
frames_diff = spriv->max_tr + 1 + temp_ref - spriv->last_tr;
- }
else
{
- if(d1 < -6) //there's a wraparound
- frames_diff = spriv->max_tr + 1 + temp_ref - spriv->last_tr;
- else if(d1 > 6) //there's a wraparound
- frames_diff = spriv->max_tr + 1 + spriv->last_tr - temp_ref;
- else if(!d1) //pre-emptive fix against broken sequences
- frames_diff = 1;
- else
- frames_diff = d1;
+ if(d1 < -6) //there's a wraparound
+ frames_diff = spriv->max_tr + 1 + temp_ref - spriv->last_tr;
+ else if(d1 > 6) //there's a wraparound
+ frames_diff = spriv->max_tr + 1 + spriv->last_tr - temp_ref;
+ else if(!d1) //pre-emptive fix against broken sequences
+ frames_diff = 1;
+ else
+ frames_diff = d1;
}
mp_msg(MSGT_MUXER, MSGL_DBG2, "\nLAST: %d, TR: %d, GOP: %d, DIFF: %d, MAX: %d, d1: %d\n",
spriv->last_tr, temp_ref, gop_reset, frames_diff, spriv->max_tr, d1);