diff options
| author | Mike Melanson <mike@multimedia.cx> | 2005-05-06 04:22:50 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2005-05-06 04:22:50 +0000 |
| commit | e3e426cc9029ba7072bf48a4789ec04c179b63f1 (patch) | |
| tree | ceea46f00c5812f65143bbe66e7fe859e025aeab /src/libffmpeg/xine_encoder.c | |
| parent | fd42eb6dec2d911a8480d7b30625b27aeb34ce6c (diff) | |
| download | xine-lib-e3e426cc9029ba7072bf48a4789ec04c179b63f1.tar.gz xine-lib-e3e426cc9029ba7072bf48a4789ec04c179b63f1.tar.bz2 | |
syncing to FFmpeg libavcodec build 4754; hook up the Indeo 2 decoder,
deploy new timebase API (pertains to MPEG-1 encoder); hopefully this
sync fixes some H.264 decoding issues as well
CVS patchset: 7523
CVS date: 2005/05/06 04:22:50
Diffstat (limited to 'src/libffmpeg/xine_encoder.c')
| -rw-r--r-- | src/libffmpeg/xine_encoder.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libffmpeg/xine_encoder.c b/src/libffmpeg/xine_encoder.c index 55f5e22ac..e2fb95389 100644 --- a/src/libffmpeg/xine_encoder.c +++ b/src/libffmpeg/xine_encoder.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_encoder.c,v 1.20 2004/12/12 22:01:09 mroi Exp $ + * $Id: xine_encoder.c,v 1.21 2005/05/06 04:22:51 tmmm Exp $ */ /* mpeg encoders for the dxr3 video out plugin. */ @@ -196,13 +196,13 @@ static int lavc_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame) this->context->gop_size = 0; /*intra frames only */ this->context->me_method = ME_ZERO; /*motion estimation type*/ - this->context->frame_rate = 90000; + this->context->time_base.den = 90000; if (frame->vo_frame.duration > 90000 / 24) - this->context->frame_rate_base = 90000 / 24; + this->context->time_base.num = 90000 / 24; else if (frame->vo_frame.duration < 90000 / 60) - this->context->frame_rate_base = 90000 / 60; + this->context->time_base.num = 90000 / 60; else - this->context->frame_rate_base = frame->vo_frame.duration; + this->context->time_base.num = frame->vo_frame.duration; /* ffmpeg can complain about illegal framerates, but since this seems no * problem for the DXR3, we just tell ffmpeg to be more lax with */ this->context->strict_std_compliance = -1; |