Skip to content
Browse files

Backport r25071 (fallback to ffmpeg estimated frame rate) to

release-0-23-fixes.


git-svn-id: http://svn.mythtv.org/svn/branches/release-0-23-fixes@25072 7dbf422c-18fa-0310-86e9-fd20926502f2
  • Loading branch information...
1 parent 62f6f34 commit ab64a9be789ff605e6d52cfa0b35ed11cfbded70 Mark Kendall committed Jun 10, 2010
Showing with 8 additions and 0 deletions.
  1. +8 −0 mythtv/libs/libmythtv/avformatdecoder.cpp
View
8 mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -1291,6 +1291,14 @@ static float normalized_fps(AVStream *stream, AVCodecContext *enc)
fps = tmpfps;
}
+ // and finally try the ffmpeg estimated rate
+ if (fps > 121.0f || fps < 3.0f)
+ {
+ float tmpfps = av_q2d(stream->r_frame_rate);
+ if (tmpfps > 20 && tmpfps < 70)
+ fps = tmpfps;
+ }
+
// If it is still out of range, just assume NTSC...
fps = (fps > 121.0f) ? (30000.0f / 1001.0f) : fps;
return fps;

0 comments on commit ab64a9b

Please sign in to comment.
Something went wrong with that request. Please try again.