diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-17 23:42:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-17 23:42:56 +0200 |
| commit | 564bb244eb6108a8cb09c212d2d56f94d9d0f4c9 (patch) | |
| tree | 91a244adc927c2ac74d36ea2c875149a0eccb864 | |
| parent | 6ca48ad044e690c43985aa380cb474f1a3df7b4e (diff) | |
| parent | db835708757462539ce6c5180ad1c07dbfdd5425 (diff) | |
| download | ffmpeg-564bb244eb6108a8cb09c212d2d56f94d9d0f4c9.tar.gz | |
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>
| -rw-r--r-- | ffplay.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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); 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, is->video_st->time_base.num, is->video_st->time_base.den, codec->sample_aspect_ratio.num, codec->sample_aspect_ratio.den); - if ((ret = avfilter_graph_create_filter(&filt_src, avfilter_get_by_name("buffer"), - "src", buffersrc_args, NULL, + "ffplay_buffer", buffersrc_args, NULL, graph)) < 0) return ret; @@ -1699,7 +1699,7 @@ static int video_thread(void *arg) frame->pts = pts_int; 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; AVFilterBufferRef *fb = avfilter_get_video_buffer_ref_from_arrays( frame->data, frame->linesize, |