Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix -vismv 1
  ffplay: rename buffer source instance from "src" to "ffplay_buffer"
  ffplay: use key=val syntax for the buffersrc args

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/59/head
Michael Niedermayer 13 years ago
commit 564bb244eb
  1. 8
      ffplay.c

@ -1560,15 +1560,15 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags); snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags);
graph->scale_sws_opts = av_strdup(sws_flags_str); graph->scale_sws_opts = av_strdup(sws_flags_str);
snprintf(buffersrc_args, sizeof(buffersrc_args), "%d:%d:%d:%d:%d:%d:%d", snprintf(buffersrc_args, sizeof(buffersrc_args),
"video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d",
codec->width, codec->height, codec->pix_fmt, codec->width, codec->height, codec->pix_fmt,
is->video_st->time_base.num, is->video_st->time_base.den, is->video_st->time_base.num, is->video_st->time_base.den,
codec->sample_aspect_ratio.num, codec->sample_aspect_ratio.den); codec->sample_aspect_ratio.num, codec->sample_aspect_ratio.den);
if ((ret = avfilter_graph_create_filter(&filt_src, if ((ret = avfilter_graph_create_filter(&filt_src,
avfilter_get_by_name("buffer"), avfilter_get_by_name("buffer"),
"src", buffersrc_args, NULL, "ffplay_buffer", buffersrc_args, NULL,
graph)) < 0) graph)) < 0)
return ret; return ret;
@ -1699,7 +1699,7 @@ static int video_thread(void *arg)
frame->pts = pts_int; frame->pts = pts_int;
frame->sample_aspect_ratio = av_guess_sample_aspect_ratio(is->ic, is->video_st, frame); frame->sample_aspect_ratio = av_guess_sample_aspect_ratio(is->ic, is->video_st, frame);
if (is->use_dr1) { if (is->use_dr1 && frame->opaque) {
FrameBuffer *buf = frame->opaque; FrameBuffer *buf = frame->opaque;
AVFilterBufferRef *fb = avfilter_get_video_buffer_ref_from_arrays( AVFilterBufferRef *fb = avfilter_get_video_buffer_ref_from_arrays(
frame->data, frame->linesize, frame->data, frame->linesize,

Loading…
Cancel
Save