Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ffplay: factorize code calling output_packet() in video_thread()

Browse Source 
Slightly simplify.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
pull/2/head
Stefano Sabatini 14 years ago
parent c632a1c205
commit 539647c6ff
1 changed files with 3 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      ffplay.c

8
ffplay.c
Unescape View File

@ -1803,14 +1803,13 @@ static int video_thread(void *arg)
{ {
VideoState *is = arg; VideoState *is = arg;
AVFrame *frame= avcodec_alloc_frame(); AVFrame *frame= avcodec_alloc_frame();
int64_t pts_int; int64_t pts_int, pos;
double pts; double pts;
int ret; int ret;
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
AVFilterGraph *graph = avfilter_graph_alloc(); AVFilterGraph *graph = avfilter_graph_alloc();
AVFilterContext *filt_out = NULL; AVFilterContext *filt_out = NULL;
int64_t pos;
if ((ret = configure_video_filters(graph, is, vfilters)) < 0) if ((ret = configure_video_filters(graph, is, vfilters)) < 0)
goto the_end; goto the_end;
@ -1844,6 +1843,7 @@ static int video_thread(void *arg)
} }
#else #else
ret = get_video_frame(is, frame, &pts_int, &pkt); ret = get_video_frame(is, frame, &pts_int, &pkt);
pos = pkt.pos;
#endif #endif
if (ret < 0) goto the_end; 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); pts = pts_int*av_q2d(is->video_st->time_base);
#if CONFIG_AVFILTER
ret = output_picture(is, frame, pts, pos); ret = output_picture(is, frame, pts, pos);
#else #if !CONFIG_AVFILTER
ret = output_picture(is, frame, pts, pkt.pos);
av_free_packet(&pkt); av_free_packet(&pkt);
#endif #endif
if (ret < 0) if (ret < 0)

Write Preview
Loading…
Cancel
Save