[FFmpeg-soc] [soc]: r842 - dirac/libavcodec/dirac.c
marco
subversion at mplayerhq.hu
Thu Aug 16 12:30:37 CEST 2007
Author: marco
Date: Thu Aug 16 12:30:37 2007
New Revision: 842
Log:
use ff_frame_rate_tab
Modified:
dirac/libavcodec/dirac.c
Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c (original)
+++ dirac/libavcodec/dirac.c Thu Aug 16 12:30:37 2007
@@ -32,6 +32,7 @@
#include "bitstream.h"
#include "golomb.h"
#include "dirac_arith.h"
+#include "mpeg12data.h"
typedef enum {
TRANSFER_FUNC_TV,
@@ -190,12 +191,6 @@ static const struct decoding_parameters
{ 4, 6, 0, 16, 24, 16, 24, 2, 1, 1, 1, 1, 1, 4, 3, 1, 1, 8, 6, 12, 8, 48, 48, 1024 }
};
-static const AVRational preset_frame_rates[8] =
-{
- {24000, 1001}, {24, 1}, {25, 1}, {30000, 1001},
- {30, 1}, {50, 1}, {60000, 1001}, {60, 1}
-};
-
static const AVRational preset_aspect_ratios[3] =
{
{1, 1}, {10, 11}, {12, 11}
@@ -491,7 +486,7 @@ static void parse_source_parameters(Dira
s->source.frame_rate.den = svq3_get_ue_golomb(gb);
} else {
/* Use a pre-set framerate. */
- s->source.frame_rate = preset_frame_rates[idx - 1];
+ s->source.frame_rate = ff_frame_rate_tab[idx];
}
}
More information about the FFmpeg-soc
mailing list