diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-04-22 11:09:48 +0200 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-04-23 12:49:04 +0200 |
commit | 539647c6ffa9c39f60cee41e1eb79e491bc4f4c5 (patch) | |
tree | 847f887dfab09218b77e9d07e8a6cba34a21b75f | |
parent | c632a1c205c59a7d716cae2d540c7b693e9a827e (diff) | |
download | ffmpeg-539647c6ffa9c39f60cee41e1eb79e491bc4f4c5.tar.gz |
ffplay: factorize code calling output_packet() in video_thread()
Slightly simplify.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
-rw-r--r-- | ffplay.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -1803,14 +1803,13 @@ static int video_thread(void *arg) { VideoState *is = arg; AVFrame *frame= avcodec_alloc_frame(); - int64_t pts_int; + int64_t pts_int, pos; double pts; int ret; #if CONFIG_AVFILTER AVFilterGraph *graph = avfilter_graph_alloc(); AVFilterContext *filt_out = NULL; - int64_t pos; if ((ret = configure_video_filters(graph, is, vfilters)) < 0) goto the_end; @@ -1844,6 +1843,7 @@ static int video_thread(void *arg) } #else ret = get_video_frame(is, frame, &pts_int, &pkt); + pos = pkt.pos; #endif if (ret < 0) goto the_end; @@ -1853,10 +1853,8 @@ static int video_thread(void *arg) pts = pts_int*av_q2d(is->video_st->time_base); -#if CONFIG_AVFILTER ret = output_picture(is, frame, pts, pos); -#else - ret = output_picture(is, frame, pts, pkt.pos); +#if !CONFIG_AVFILTER av_free_packet(&pkt); #endif if (ret < 0) |