[SCM] libav/experimental: video4linux2: Avoid a floating point exception

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit dc71f1958846bb1d96de43a4603983dc8450cfcc
Author: Bernhard Übelacker <bernhardu at vr-web.de>
Date:   Sun Jul 27 08:38:59 2014 -0700

    video4linux2: Avoid a floating point exception
    
    This avoids a segfault in avconv_opt.c:opt_target when trying to
    determine the norm.

diff --git a/avconv_opt.c b/avconv_opt.c
index f8c5245..434ba0b 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -1757,7 +1757,8 @@ static int opt_target(void *optctx, const char *opt, const char *arg)
             for (j = 0; j < nb_input_files; j++) {
                 for (i = 0; i < input_files[j]->nb_streams; i++) {
                     AVCodecContext *c = input_files[j]->ctx->streams[i]->codec;
-                    if (c->codec_type != AVMEDIA_TYPE_VIDEO)
+                    if (c->codec_type != AVMEDIA_TYPE_VIDEO ||
+                        !c->time_base.num)
                         continue;
                     fr = c->time_base.den * 1000 / c->time_base.num;
                     if (fr == 25000) {

-- 
Libav/FFmpeg packaging