[x264-devel] commit: Workaround bug in fps/timestamp handling with lavf input ( Yasuhiro Ikeda )

[git at videolan.org]

x264 | branch: stable | Yasuhiro Ikeda <wipple625 at gmail.com> | Tue Aug  3 22:07:36 2010 +0900| [13230db01dc3f8554c3aa2dd3b82faa703a0f37b] | committer: Jason Garrett-Glaser 

Workaround bug in fps/timestamp handling with lavf input
reordered_opaque in lavf doesn't work correctly in the identity case (no reordering).
Fixes incorrect output for some file types (e.g. raw in mov).

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=13230db01dc3f8554c3aa2dd3b82faa703a0f37b
---

 input/lavf.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/input/lavf.c b/input/lavf.c
index e1dd352..55112bf 100644
--- a/input/lavf.c
+++ b/input/lavf.c
@@ -96,7 +96,7 @@ static int read_frame_internal( cli_pic_t *p_pic, lavf_hnd_t *h, int i_frame, vi
     if( h->vfr_input )
     {
         p_pic->pts = p_pic->duration = 0;
-        if( frame.reordered_opaque != AV_NOPTS_VALUE )
+        if( c->has_b_frames && frame.reordered_opaque != AV_NOPTS_VALUE )
             p_pic->pts = frame.reordered_opaque;
         else if( pkt->dts != AV_NOPTS_VALUE )
             p_pic->pts = pkt->dts; // for AVI files