diff --git a/ffmpeg/extras.c b/ffmpeg/extras.c
index ac30ec31bf..a0d406920e 100644
--- a/ffmpeg/extras.c
+++ b/ffmpeg/extras.c
@@ -177,9 +177,8 @@ int lpms_get_codec_info(char *fname, pcodec_info out)
       out->width  = ic->streams[vstream]->codecpar->width;
       out->height = ic->streams[vstream]->codecpar->height;
       
-      AVRational frame_rate = av_guess_frame_rate(ic,ic->streams[vstream],NULL);
-      out->fps = (frame_rate.num && frame_rate.den ? av_q2d(frame_rate) : 0);
-      out->dur = (double)ic->streams[vstream]->nb_frames / out->fps;
+      out->fps = av_q2d(ic->streams[vstream]->avg_frame_rate);
+      out->dur = ic->duration / AV_TIME_BASE;
   } else {
       // Indicate failure to extract video codec from given container
       out->video_codec[0] = 0;