Revision 3966a574

View differences:

ffplay.c
1457 1457
    return queue_picture(is, src_frame, pts, pos);
1458 1458
}
1459 1459

  
1460
static int get_video_frame(VideoState *is, AVFrame *frame, uint64_t *pts, AVPacket *pkt)
1460
static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacket *pkt)
1461 1461
{
1462 1462
    int len1, got_picture, i;
1463 1463

  
......
1519 1519
        else
1520 1520
            *pts= 0;
1521 1521

  
1522
        /* put pts into units of 1/AV_TIME_BASE */
1523
        *pts = av_rescale_q(pts,is->video_st->time_base, AV_TIME_BASE_Q);
1524

  
1525 1522
//            if (len1 < 0)
1526 1523
//                break;
1527 1524
    if (got_picture)
......
1556 1553
{
1557 1554
    FilterPriv *priv = link->src->priv;
1558 1555
    AVFilterPicRef *picref;
1559
    uint64_t pts = 0;
1556
    int64_t pts = 0;
1560 1557
    AVPacket pkt;
1561 1558
    int ret;
1562 1559

  
......
1636 1633
}
1637 1634

  
1638 1635
static int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame,
1639
                                    uint64_t *pts)
1636
                                    int64_t *pts)
1640 1637
{
1641 1638
    AVFilterPicRef *pic;
1642 1639

  
......
1674 1671
{
1675 1672
    VideoState *is = arg;
1676 1673
    AVFrame *frame= avcodec_alloc_frame();
1677
    uint64_t pts_int;
1674
    int64_t pts_int;
1678 1675
    double pts;
1679 1676
    int ret;
1680 1677

  
......
1737 1734
        if (!ret)
1738 1735
            continue;
1739 1736

  
1740
        pts  = pts_int;
1741
        pts /= AV_TIME_BASE;
1737
        pts = pts_int*av_q2d(is->video_st->time_base);
1742 1738

  
1743 1739
#if CONFIG_AVFILTER
1744 1740
        ret = output_picture2(is, frame, pts,  -1); /* fixme: unknown pos */

Also available in: Unified diff