diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-08-16 22:02:57 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-08-16 22:02:57 +0000 |
| commit | be645b69e246ccf92859d5a9931459f88009146b (patch) | |
| tree | 6c691423f7f7f4ed61a24220b107af86a87813ab | |
| parent | 784fb4f62fe8fc4110244dfad888bc86f05a4649 (diff) | |
ext/ffmpeg/: If you ever crash again on premature fixation, I'll cut your @#$^#$ off, you ^$#^!#^.
Original commit message from CVS:
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_connect):
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_link):
If you ever crash again on premature fixation, I'll cut your @#$^#$
off, you ^$#^!#^.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegdec.c | 3 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegenc.c | 3 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2005-08-17 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + + * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_connect): + * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_link): + If you ever crash again on premature fixation, I'll cut your @#$^#$ + off, you ^$#^!#^. + 2005-08-16 Ronald S. Bultje <rbultje@ronald.bitfreak.net> * autogen.sh: diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index 0753b207ef..cb12b55139 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -453,7 +453,8 @@ gst_ffmpegdec_connect (GstPad * pad, const GstCaps * caps) /* get size and so */ gst_ffmpeg_caps_with_codecid (oclass->in_plugin->id, oclass->in_plugin->type, caps, ffmpegdec->context); - if (!ffmpegdec->context->time_base.den) { + if (!ffmpegdec->context->time_base.den || + !ffmpegdec->context->time_base.num) { ffmpegdec->context->time_base.num = 1; ffmpegdec->context->time_base.den = 25; } diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c index ca859f2178..5694411510 100644 --- a/ext/ffmpeg/gstffmpegenc.c +++ b/ext/ffmpeg/gstffmpegenc.c @@ -385,7 +385,8 @@ gst_ffmpegenc_link (GstPad * pad, const GstCaps * caps) /* fetch pix_fmt and so on */ gst_ffmpeg_caps_with_codectype (oclass->in_plugin->type, caps, ffmpegenc->context); - if (!ffmpegenc->context->time_base.den) { + if (!ffmpegenc->context->time_base.den || + !ffmpegenc->context->time_base.num) { ffmpegenc->context->time_base.den = 25; ffmpegenc->context->time_base.num = 1; } |