diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-05-23 10:52:40 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-05-23 10:52:40 +0000 |
| commit | 64d6b94a1caff564af3680dbb4318e33755fd208 (patch) | |
| tree | 5b2c8db00c80428386a2332efe428e6a0a782cd0 | |
| parent | 7b9c078c1886c09360f2fffc454a5eeb19de9e3b (diff) | |
| download | xine-lib-64d6b94a1caff564af3680dbb4318e33755fd208.tar.gz xine-lib-64d6b94a1caff564af3680dbb4318e33755fd208.tar.bz2 | |
fix the miscalculates and then copy'n'pasted durations we discovered some time ago
CVS patchset: 4904
CVS date: 2003/05/23 10:52:40
| -rw-r--r-- | src/dxr3/dxr3_decode_video.c | 8 | ||||
| -rw-r--r-- | src/libffmpeg/xine_decoder.c | 8 | ||||
| -rw-r--r-- | src/libmpeg2/decode.c | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 8e72a165d..15084853a 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dxr3_decode_video.c,v 1.33 2003/05/23 10:36:29 mroi Exp $ + * $Id: dxr3_decode_video.c,v 1.34 2003/05/23 10:52:40 mroi Exp $ */ /* dxr3 video decoder plugin. @@ -691,7 +691,7 @@ static int get_duration(dxr3_decoder_t *this) switch (this->frame_rate_code) { case 1: /* 23.976 */ - duration = 3913; + duration = 3754; /* actually it's 3753.75 */ break; case 2: /* 24.000 */ duration = 3750; @@ -709,10 +709,10 @@ static int get_duration(dxr3_decoder_t *this) duration = 1800; break; case 7: /* 59.940 */ - duration = 1525; + duration = 1502; /* actually it's 1501.5 */ break; case 8: /* 60.000 */ - duration = 1509; + duration = 1500; break; default: printf("dxr3_decode_video: WARNING: unknown frame rate code %d\n", diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c index e7edb5b59..9315317e5 100644 --- a/src/libffmpeg/xine_decoder.c +++ b/src/libffmpeg/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.118 2003/05/09 23:54:05 tmmm Exp $ + * $Id: xine_decoder.c,v 1.119 2003/05/23 10:52:40 mroi Exp $ * * xine decoder plugin using ffmpeg * @@ -434,7 +434,7 @@ static void find_sequence_header (ff_video_decoder_t *this, switch (frame_rate_code) { case 1: /* 23.976 fps */ - this->video_step = 3913; + this->video_step = 3754; /* actually it's 3753.75 */ break; case 2: /* 24 fps */ this->video_step = 3750; @@ -452,10 +452,10 @@ static void find_sequence_header (ff_video_decoder_t *this, this->video_step = 1800; break; case 7: /* 59.94 fps */ - this->video_step = 1525; + this->video_step = 1502; /* actually it's 1501.5 */ break; case 8: /* 60 fps */ - this->video_step = 1509; + this->video_step = 1500; break; default: printf ("ffmpeg: invalid/unknown frame rate code : %d \n", diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c index e9093bc85..5f4aa0338 100644 --- a/src/libmpeg2/decode.c +++ b/src/libmpeg2/decode.c @@ -90,7 +90,7 @@ static inline void get_frame_duration (mpeg2dec_t * mpeg2dec, vo_frame_t *frame) { switch (mpeg2dec->picture->frame_rate_code) { case 1: /* 23.976 fps */ - frame->duration = 3913; + frame->duration = 3754; /* actually it's 3753.75 */ break; case 2: /* 24 fps */ frame->duration = 3750; @@ -108,10 +108,10 @@ static inline void get_frame_duration (mpeg2dec_t * mpeg2dec, vo_frame_t *frame) frame->duration = 1800; break; case 7: /* 59.94 fps */ - frame->duration = 1525; + frame->duration = 1502; /* actually it's 1501.5 */ break; case 8: /* 60 fps */ - frame->duration = 1509; + frame->duration = 1500; break; default: /* printf ("invalid/unknown frame rate code : %d \n", |