generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

10l fix timestamps (lavfi update broke them)

Browse Source 
Originally committed as revision 22218 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-03-05 03:54:39 +00:00
parent fca6259942
commit 3966a57464
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ffplay.c
View File

@ -1457,7 +1457,7 @@ static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1, int6
return queue_picture(is, src_frame, pts, pos); return queue_picture(is, src_frame, pts, pos);
} }
static int get_video_frame(VideoState *is, AVFrame *frame, uint64_t *pts, AVPacket *pkt) static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacket *pkt)
{ {
int len1, got_picture, i; int len1, got_picture, i;
@ -1519,9 +1519,6 @@ static int get_video_frame(VideoState *is, AVFrame *frame, uint64_t *pts, AVPack
else else
*pts= 0; *pts= 0;
/* put pts into units of 1/AV_TIME_BASE */
*pts = av_rescale_q(pts,is->video_st->time_base, AV_TIME_BASE_Q);
// if (len1 < 0) // if (len1 < 0)
// break; // break;
if (got_picture) if (got_picture)
@ -1556,7 +1553,7 @@ static int input_request_frame(AVFilterLink *link)
{ {
FilterPriv *priv = link->src->priv; FilterPriv *priv = link->src->priv;
AVFilterPicRef *picref; AVFilterPicRef *picref;
uint64_t pts = 0; int64_t pts = 0;
AVPacket pkt; AVPacket pkt;
int ret; int ret;
@ -1636,7 +1633,7 @@ static int output_query_formats(AVFilterContext *ctx)
} }
static int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame, static int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame,
uint64_t *pts) int64_t *pts)
{ {
AVFilterPicRef *pic; AVFilterPicRef *pic;
@ -1674,7 +1671,7 @@ static int video_thread(void *arg)
{ {
VideoState *is = arg; VideoState *is = arg;
AVFrame *frame= avcodec_alloc_frame(); AVFrame *frame= avcodec_alloc_frame();
uint64_t pts_int; int64_t pts_int;
double pts; double pts;
int ret; int ret;
@ -1737,8 +1734,7 @@ static int video_thread(void *arg)
if (!ret) if (!ret)
continue; continue;
pts = pts_int; pts = pts_int*av_q2d(is->video_st->time_base);
pts /= AV_TIME_BASE;
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
ret = output_picture2(is, frame, pts, -1); /* fixme: unknown pos */ ret = output_picture2(is, frame, pts, -1); /* fixme: unknown pos */