summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2013-10-22 17:26:39 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2013-10-22 17:26:42 (GMT)
commitf94124c23e0aeb6ee89b289ce0de54720c17baec (patch)
treebdcb45f88547acbe22a3cc137104f55138938f22
parent4aeafbaab891d81c377f92be3969d8d3e6abf379 (diff)
parent00d7369de06a16f7c8770a899fcb16bcb94b1e20 (diff)
downloadffmpeg-f94124c23e0aeb6ee89b289ce0de54720c17baec.zip
ffmpeg-f94124c23e0aeb6ee89b289ce0de54720c17baec.tar.gz
ffmpeg-f94124c23e0aeb6ee89b289ce0de54720c17baec.tar.bz2
Merge commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20'
* commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20': vf_fieldorder: log when processing is skipped Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--libavfilter/vf_fieldorder.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c
index c44350f..eb5e189 100644
--- a/libavfilter/vf_fieldorder.c
+++ b/libavfilter/vf_fieldorder.c
@@ -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;