[FFmpeg-cvslog] vf_interlace: fix frame rate

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 12 16:40:35 2013 +0200| [227b4458fb434875b127a0c2306fa3b899a770bf] | committer: Michael Niedermayer

vf_interlace: fix frame rate

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=227b4458fb434875b127a0c2306fa3b899a770bf
---

 libavfilter/vf_interlace.c      |    2 ++
 tests/ref/fate/filter-interlace |   50 +++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/libavfilter/vf_interlace.c b/libavfilter/vf_interlace.c
index 8a3a43c..e42684f 100755
--- a/libavfilter/vf_interlace.c
+++ b/libavfilter/vf_interlace.c
@@ -113,8 +113,10 @@ static int config_out_props(AVFilterLink *outlink)
     outlink->w = inlink->w;
     outlink->h = inlink->h;
     outlink->time_base = inlink->time_base;
+    outlink->frame_rate = inlink->frame_rate;
     // half framerate
     outlink->time_base.num *= 2;
+    outlink->frame_rate.den *= 2;
 
     av_log(ctx, AV_LOG_VERBOSE, "%s interlacing %s lowpass filter\n",
            s->scan == MODE_TFF ? "tff" : "bff", (s->lowpass) ? "with" : "without");
diff --git a/tests/ref/fate/filter-interlace b/tests/ref/fate/filter-interlace
index 4fa495c..4659942 100644
--- a/tests/ref/fate/filter-interlace
+++ b/tests/ref/fate/filter-interlace
@@ -1,26 +1,26 @@
-#tb 0: 1/25
+#tb 0: 2/25
 0,          0,          0,        1,   152064, 0x6077db38
-0,          2,          2,        1,   152064, 0x3d4f1b15
-0,          4,          4,        1,   152064, 0x447594f6
-0,          6,          6,        1,   152064, 0xb6258a38
-0,          8,          8,        1,   152064, 0x296abb09
-0,         10,         10,        1,   152064, 0x0fad069d
-0,         12,         12,        1,   152064, 0x92c78c0d
-0,         14,         14,        1,   152064, 0x645531fd
-0,         16,         16,        1,   152064, 0xe7652880
-0,         18,         18,        1,   152064, 0x496e1151
-0,         20,         20,        1,   152064, 0x7f7cfb06
-0,         22,         22,        1,   152064, 0x45e9affe
-0,         24,         24,        1,   152064, 0xaedb2d3a
-0,         26,         26,        1,   152064, 0x03fd9ae6
-0,         28,         28,        1,   152064, 0x2084e84d
-0,         30,         30,        1,   152064, 0xcf05faf6
-0,         32,         32,        1,   152064, 0x84c746c2
-0,         34,         34,        1,   152064, 0x898a6321
-0,         36,         36,        1,   152064, 0xe12b7fe9
-0,         38,         38,        1,   152064, 0x12feb756
-0,         40,         40,        1,   152064, 0xd813601a
-0,         42,         42,        1,   152064, 0xc0f3d385
-0,         44,         44,        1,   152064, 0xfca3a63f
-0,         46,         46,        1,   152064, 0xa0796f44
-0,         48,         48,        1,   152064, 0x1d26af11
+0,          1,          1,        1,   152064, 0x3d4f1b15
+0,          2,          2,        1,   152064, 0x447594f6
+0,          3,          3,        1,   152064, 0xb6258a38
+0,          4,          4,        1,   152064, 0x296abb09
+0,          5,          5,        1,   152064, 0x0fad069d
+0,          6,          6,        1,   152064, 0x92c78c0d
+0,          7,          7,        1,   152064, 0x645531fd
+0,          8,          8,        1,   152064, 0xe7652880
+0,          9,          9,        1,   152064, 0x496e1151
+0,         10,         10,        1,   152064, 0x7f7cfb06
+0,         11,         11,        1,   152064, 0x45e9affe
+0,         12,         12,        1,   152064, 0xaedb2d3a
+0,         13,         13,        1,   152064, 0x03fd9ae6
+0,         14,         14,        1,   152064, 0x2084e84d
+0,         15,         15,        1,   152064, 0xcf05faf6
+0,         16,         16,        1,   152064, 0x84c746c2
+0,         17,         17,        1,   152064, 0x898a6321
+0,         18,         18,        1,   152064, 0xe12b7fe9
+0,         19,         19,        1,   152064, 0x12feb756
+0,         20,         20,        1,   152064, 0xd813601a
+0,         21,         21,        1,   152064, 0xc0f3d385
+0,         22,         22,        1,   152064, 0xfca3a63f
+0,         23,         23,        1,   152064, 0xa0796f44
+0,         24,         24,        1,   152064, 0x1d26af11