diff options
| author | Stéphane Loeuillet <gstreamer@leroutier.net> | 2005-01-14 12:27:22 +0000 |
|---|---|---|
| committer | Stéphane Loeuillet <gstreamer@leroutier.net> | 2005-01-14 12:27:22 +0000 |
| commit | 2085403d60290de6f70b9d73b99adcc256080f48 (patch) | |
| tree | b3842a83d25d180db42330e4f6c448221f9a95ca | |
| parent | ad1aad031b6977213582c46860093136329837c6 (diff) | |
| download | gst-plugins-bad-2085403d60290de6f70b9d73b99adcc256080f48.tar.gz gst-plugins-bad-2085403d60290de6f70b9d73b99adcc256080f48.tar.bz2 gst-plugins-bad-2085403d60290de6f70b9d73b99adcc256080f48.zip | |
replace framerate aproximations by their real value (24000/1001, 30000/1001, 60000/1001)
Original commit message from CVS:
* ext/dv/gstdvdec.c:
* ext/libfame/gstlibfame.c:
* gst/subparse/gstsubparse.c: (parse_mdvdsub):
* gst/y4m/gsty4mencode.c: (gst_y4mencode_sinkconnect):
replace framerate aproximations by their real value
(24000/1001, 30000/1001, 60000/1001)
Finish fixing bug #164049
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ext/libfame/gstlibfame.c | 8 | ||||
| -rw-r--r-- | gst/y4m/gsty4mencode.c | 6 |
3 files changed, 17 insertions, 7 deletions
@@ -1,3 +1,13 @@ +2005-01-14 Stephane LOEUILLET <stephane.loeuillet@tiscali.fr> + + * ext/dv/gstdvdec.c: + * ext/libfame/gstlibfame.c: + * gst/subparse/gstsubparse.c: (parse_mdvdsub): + * gst/y4m/gsty4mencode.c: (gst_y4mencode_sinkconnect): + replace framerate aproximations by their real value + (24000/1001, 30000/1001, 60000/1001) + Finish fixing bug #164049 + 2005-01-13 Thomas Vander Stichele <thomas at apestaart dot org> * ext/ogg/gstoggmux.c: diff --git a/ext/libfame/gstlibfame.c b/ext/libfame/gstlibfame.c index 5024bb12..f33dfd19 100644 --- a/ext/libfame/gstlibfame.c +++ b/ext/libfame/gstlibfame.c @@ -69,8 +69,8 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", "format = (fourcc) I420, " "width = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], " - "framerate = (double) { 23.976024, 24.0, 25.0, 29.970030, 30.0, " - " 50.0, 59.940060, 60.0 }") + "framerate = (double) { 23.976023976, 24.0, 25.0, 29.97002997, 30.0, " + " 50.0, 59.94005994, 60.0 }") ); static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", @@ -81,8 +81,8 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", "systemstream = (boolean) FALSE, " "width = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], " - "framerate = (double) { 23.976024, 24.0, 25.0, 29.970030, 30.0, " - " 50.0, 59.940060, 60.0 }") + "framerate = (double) { 23.976023976, 24.0, 25.0, 29.97002997, 30.0, " + " 50.0, 59.94005994, 60.0 }") ); #define MAX_FRAME_RATES 9 diff --git a/gst/y4m/gsty4mencode.c b/gst/y4m/gsty4mencode.c index 25e1f94e..396b0625 100644 --- a/gst/y4m/gsty4mencode.c +++ b/gst/y4m/gsty4mencode.c @@ -136,11 +136,11 @@ gst_y4mencode_sinkconnect (GstPad * pad, const GstCaps * caps) gdouble fps; gdouble framerates[] = { 00.000, - 23.976, 24.000, /* 24fps movie */ + 24000 / 1001, 24.000, /* 24fps movie */ 25.000, /* PAL */ - 29.970, 30.000, /* NTSC */ + 30000 / 1001, 30.000, /* NTSC */ 50.000, - 59.940, 60.000 + 60000 / 1001, 60.000 }; GstStructure *structure; |