mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-29 14:30:27 +00:00
Merge commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20'
* commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20': vf_fieldorder: log when processing is skipped Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
f94124c23e
@ -84,8 +84,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
|
||||
AVFrame *out;
|
||||
|
||||
if (!frame->interlaced_frame ||
|
||||
frame->top_field_first == s->dst_tff)
|
||||
frame->top_field_first == s->dst_tff) {
|
||||
av_log(ctx, AV_LOG_VERBOSE,
|
||||
"Skipping %s.\n",
|
||||
frame->interlaced_frame ?
|
||||
"frame with same field order" : "progressive frame");
|
||||
return ff_filter_frame(outlink, frame);
|
||||
}
|
||||
|
||||
if (av_frame_is_writable(frame)) {
|
||||
out = frame;
|
||||
|
Loading…
Reference in New Issue
Block a user