Clément Bœsch
12 years ago
2 changed files with 3 additions and 2 deletions
Unified View
Diff Options
-
+1 -1libavfilter/version.h
-
+2 -1libavfilter/vf_yadif.c
+ 1
- 1
libavfilter/version.h
View File
| @@ -31,7 +31,7 @@ | |||||
| #define LIBAVFILTER_VERSION_MAJOR 3 | #define LIBAVFILTER_VERSION_MAJOR 3 | ||||
| #define LIBAVFILTER_VERSION_MINOR 68 | #define LIBAVFILTER_VERSION_MINOR 68 | ||||
| #define LIBAVFILTER_VERSION_MICRO 101 | |||||
| #define LIBAVFILTER_VERSION_MICRO 102 | |||||
| #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ | ||||
| LIBAVFILTER_VERSION_MINOR, \ | LIBAVFILTER_VERSION_MINOR, \ | ||||
+ 2
- 1
libavfilter/vf_yadif.c
View File
| @@ -280,7 +280,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) | |||||
| if (!yadif->cur) | if (!yadif->cur) | ||||
| return 0; | return 0; | ||||
| if (yadif->deint && !yadif->cur->interlaced_frame) { | |||||
| if ((yadif->deint && !yadif->cur->interlaced_frame) || ctx->is_disabled) { | |||||
| yadif->out = av_frame_clone(yadif->cur); | yadif->out = av_frame_clone(yadif->cur); | ||||
| if (!yadif->out) | if (!yadif->out) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| @@ -484,4 +484,5 @@ AVFilter avfilter_vf_yadif = { | |||||
| .inputs = avfilter_vf_yadif_inputs, | .inputs = avfilter_vf_yadif_inputs, | ||||
| .outputs = avfilter_vf_yadif_outputs, | .outputs = avfilter_vf_yadif_outputs, | ||||
| .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, | |||||
| }; | }; | ||||