[FFmpeg-devel] [PATCH 1/4] timecode: more tolerant frame rate check for drop flag.

[Clément Bœsch]

On Thu, Jan 05, 2012 at 02:06:52PM -0800, Baptiste Coudurier wrote:
> On 01/05/2012 12:03 PM, Clément Bœsch wrote:
> > From: Clément Bœsch <clement.boesch at smartjog.com>
> > 
> > This fixes some timecode probing in MOV.
> > ---
> >  libavcodec/timecode.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/libavcodec/timecode.c b/libavcodec/timecode.c
> > index 00b40b7..420b276 100644
> > --- a/libavcodec/timecode.c
> > +++ b/libavcodec/timecode.c
> > @@ -64,7 +64,7 @@ int avpriv_check_timecode_rate(void *avcl, AVRational rate, int drop)
> >          return -1;
> >      }
> >      fps = (rate.num + rate.den/2) / rate.den;
> > -    if (drop && (rate.den != 1001 || fps != 30)) {
> > +    if (drop && fps != 30) {
> >          av_log(avcl, AV_LOG_ERROR, "Drop frame is only allowed with 30000/1001 FPS\n");
> >          return -2;
> >      }
> 
> Ok
> 

Thanks, pushed.

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120106/6c7f7bd5/attachment.asc>