From 14bea432f16d7c66f9099e427819028b6b4c3bdc Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 12 Mar 2003 15:16:19 +0000 Subject: per context frame_rate_base, this should finally fix frame_rate related av sync issues Originally committed as revision 1666 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpeg12data.h | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) (limited to 'libavcodec/mpeg12data.h') diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h index d18640d074..16d607067f 100644 --- a/libavcodec/mpeg12data.h +++ b/libavcodec/mpeg12data.h @@ -385,16 +385,28 @@ static const uint8_t mbMotionVectorTable[17][2] = { { 0xc, 10 }, }; -static const int frame_rate_tab[9] = { - 0, - 24000 * FRAME_RATE_BASE / 1001, - 24000 * FRAME_RATE_BASE / 1000, - 25000 * FRAME_RATE_BASE / 1000, - 30000 * FRAME_RATE_BASE / 1001, - 30000 * FRAME_RATE_BASE / 1000, - 50000 * FRAME_RATE_BASE / 1000, - 60000 * FRAME_RATE_BASE / 1001, - 60000 * FRAME_RATE_BASE / 1000, +#define MPEG1_FRAME_RATE_BASE 1001 + +static const int frame_rate_tab[16] = { + 0, + 24000, + 24024, + 25025, + 30000, + 30030, + 50050, + 60000, + 60060, + // Xing's 15fps: (9) + 15015, + // libmpeg3's "Unofficial economy rates": (10-13) + 5005, + 10010, + 12012, + 15015, + // random, just to avoid segfault !never encode these + 25025, + 25025, }; static const uint8_t non_linear_qscale[32] = { -- cgit v1.2.3