[FFmpeg-cvslog] lavfi/deinterlace_vaapi: fix can't show full option information.
ffmpeg | branch: master | Jun Zhao | Tue Jan 16 22:44:02
2018 +0800| [383804edd812410219a097e2bf3efac8a8b4562a] | committer: Michael
Niedermayer
lavfi/deinterlace_vaapi: fix can't show full option information.
use ffmpeg -h filter=deinterlace_vaapi can't get full help information,
the root cause is not setting the flags fileld in options.
Signed-off-by: Jun Zhao
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=383804edd812410219a097e2bf3efac8a8b4562a
---
libavfilter/vf_deinterlace_vaapi.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavfilter/vf_deinterlace_vaapi.c
b/libavfilter/vf_deinterlace_vaapi.c
index 44c5ae7642..a38da5d57b 100644
--- a/libavfilter/vf_deinterlace_vaapi.c
+++ b/libavfilter/vf_deinterlace_vaapi.c
@@ -615,22 +615,22 @@ static const AVOption deint_vaapi_options[] = {
OFFSET(mode), AV_OPT_TYPE_INT, { .i64 = VAProcDeinterlacingNone },
VAProcDeinterlacingNone, VAProcDeinterlacingCount - 1, FLAGS, "mode" },
{ "default", "Use the highest-numbered (and therefore possibly most
advanced) deinterlacing algorithm",
- 0, AV_OPT_TYPE_CONST, { .i64 = VAProcDeinterlacingNone }, .unit = "mode"
},
+ 0, AV_OPT_TYPE_CONST, { .i64 = VAProcDeinterlacingNone }, 0, 0, FLAGS,
"mode" },
{ "bob", "Use the bob deinterlacing algorithm",
- 0, AV_OPT_TYPE_CONST, { .i64 = VAProcDeinterlacingBob }, .unit = "mode"
},
+ 0, AV_OPT_TYPE_CONST, { .i64 = VAProcDeinterlacingBob }, 0, 0, FLAGS,
"mode" },
{ "weave", "Use the weave deinterlacing algorithm",
- 0, AV_OPT_TYPE_CONST, { .i64 = VAProcDeinterlacingWeave }, .unit =
"mode" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = VAProcDeinterlacingWeave }, 0, 0, FLAGS,
"mode" },
{ "motion_adaptive", "Use the motion adaptive deinterlacing algorithm",
- 0, AV_OPT_TYPE_CONST, { .i64 = VAProcDeinterlacingMotionAdaptive },
.unit = "mode" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = VAProcDeinterlacingMotionAdaptive }, 0,
0, FLAGS, "mode" },
{ "motion_compensated", "Use the motion compensated deinterlacing
algorithm",
- 0, AV_OPT_TYPE_CONST, { .i64 = VAProcDeinterlacingMotionCompensated },
.unit = "mode" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = VAProcDeinterlacingMotionCompensated },
0, 0, FLAGS, "mode" },
{ "rate", "Generate output at frame rate or field rate",
OFFSET(field_rate), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, 2, FLAGS, "rate" },
{ "frame", "Output at frame rate (one frame of output for each
field-pair)",
- 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, .unit = "rate" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, FLAGS, "rate" },
{ "field", "Output at field rate (one frame of output for each field)",
- 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, .unit = "rate" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, 0, 0, FLAGS, "rate" },
{ "auto", "Only deinterlace fields, passing frames through unchanged",
OFFSET(auto_enable), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, FLAGS },
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/vidstab: check bytesPerPixel only for packed formats.
ffmpeg | branch: master | Gyan Doshi | Sat Dec 23
16:32:25 2017 +0530| [e1e89c0695b430ca1f0f869ac8a2b6b46be9e2fa] | committer:
Michael Niedermayer
avfilter/vidstab: check bytesPerPixel only for packed formats.
libvidstab introduced this variable only for packed formats but in
vf_vidstab*.c, it's checked for all inputs. So the filter errors out for
YUV422/444P streams.
Fixes #6736.
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1e89c0695b430ca1f0f869ac8a2b6b46be9e2fa
---
libavfilter/vf_vidstabdetect.c| 3 ++-
libavfilter/vf_vidstabtransform.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavfilter/vf_vidstabdetect.c b/libavfilter/vf_vidstabdetect.c
index 63a178a0c2..fd7ff3be24 100644
--- a/libavfilter/vf_vidstabdetect.c
+++ b/libavfilter/vf_vidstabdetect.c
@@ -107,10 +107,11 @@ static int config_input(AVFilterLink *inlink)
VSMotionDetect* md = &(s->md);
VSFrameInfo fi;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
+int is_planar = desc->flags & AV_PIX_FMT_FLAG_PLANAR;
vsFrameInfoInit(&fi, inlink->w, inlink->h,
ff_av2vs_pixfmt(ctx, inlink->format));
-if (fi.bytesPerPixel != av_get_bits_per_pixel(desc)/8) {
+if (!is_planar && fi.bytesPerPixel != av_get_bits_per_pixel(desc)/8) {
av_log(ctx, AV_LOG_ERROR, "pixel-format error: wrong bits/per/pixel,
please report a BUG");
return AVERROR(EINVAL);
}
diff --git a/libavfilter/vf_vidstabtransform.c
b/libavfilter/vf_vidstabtransform.c
index 11a0e3d512..d1ec1391cb 100644
--- a/libavfilter/vf_vidstabtransform.c
+++ b/libavfilter/vf_vidstabtransform.c
@@ -146,6 +146,7 @@ static int config_input(AVFilterLink *inlink)
FILE *f;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
+int is_planar = desc->flags & AV_PIX_FMT_FLAG_PLANAR;
VSTransformData *td = &(tc->td);
@@ -161,7 +162,7 @@ static int config_input(AVFilterLink *inlink)
return AVERROR(EINVAL);
}
-if (fi_src.bytesPerPixel != av_get_bits_per_pixel(desc)/8 ||
+if ((!is_planar && fi_src.bytesPerPixel != av_get_bits_per_pixel(desc)/8)
||
fi_src.log2ChromaW != desc->log2_chroma_w ||
fi_src.log2ChromaH != desc->log2_chroma_h) {
av_log(ctx, AV_LOG_ERROR, "pixel-format error: bpp %i<>%i ",
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat: small cosmetics after 6512ff72f9
ffmpeg | branch: master | James Almer | Wed Jan 17 19:39:24
2018 -0300| [1b5d3c08e3fbaa1fb6ba43532ce79904b0d5650b] | committer: James Almer
avformat: small cosmetics after 6512ff72f9
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b5d3c08e3fbaa1fb6ba43532ce79904b0d5650b
---
libavformat/avformat.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index b0387214c5..bfb57d7757 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -991,6 +991,8 @@ typedef struct AVStream {
* String containing pairs of key and values describing recommended
encoder configuration.
* Pairs are separated by ','.
* Keys are separated from values by '='.
+ *
+ * @deprecated unused
*/
attribute_deprecated
char *recommended_encoder_configuration;
@@ -1220,8 +1222,8 @@ attribute_deprecated
AVRational av_stream_get_r_frame_rate(const AVStream *s);
attribute_deprecated
void av_stream_set_r_frame_rate(AVStream *s, AVRational r);
-attribute_deprecated
#if FF_API_LAVF_FFSERVER
+attribute_deprecated
char* av_stream_get_recommended_encoder_configuration(const AVStream *s);
attribute_deprecated
void av_stream_set_recommended_encoder_configuration(AVStream *s, char
*configuration);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
