[FFmpeg-cvslog] avformat/mlvdec:drop unnecessary check before ff_format_io_close
ffmpeg | branch: master | Steven Liu | Sat Nov 9 11:27:14 2019 +0900| [bb190ded678a0ad8fc365af897b042c9dd013936] | committer: Steven Liu avformat/mlvdec:drop unnecessary check before ff_format_io_close Reviewed-by: Linjie Fu Reviewed-by: Jun Zhao Signed-off-by: Steven Liu > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb190ded678a0ad8fc365af897b042c9dd013936 --- libavformat/mlvdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/mlvdec.c b/libavformat/mlvdec.c index 68ca2c5e1c..dae13cae53 100644 --- a/libavformat/mlvdec.c +++ b/libavformat/mlvdec.c @@ -462,8 +462,7 @@ static int read_close(AVFormatContext *s) MlvContext *mlv = s->priv_data; int i; for (i = 0; i < 100; i++) -if (mlv->pb[i]) -ff_format_io_close(s, >pb[i]); +ff_format_io_close(s, >pb[i]); return 0; } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/libvpxenc,cosmetics: fix a typo
ffmpeg | branch: master | James Zern | Fri Nov 8 17:48:29
2019 -0800| [a605e9ad1e12dfbc632f9a1dc17f5dd9c69776c6] | committer: James Zern
avcodec/libvpxenc,cosmetics: fix a typo
predicition -> prediction
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a605e9ad1e12dfbc632f9a1dc17f5dd9c69776c6
---
libavcodec/libvpxenc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index eb5272a21e..721a052641 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -1434,7 +1434,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket
*pkt,
{ "default", "Improve resiliency against losses of whole frames",
0, AV_OPT_TYPE_CONST, {.i64 = VPX_ERROR_RESILIENT_DEFAULT}, 0, 0, VE, "er"}, \
{ "partitions", "The frame partitions are independently decodable " \
"by the bool decoder, meaning that partitions can be
decoded even " \
- "though earlier partitions have been lost. Note that
intra predicition" \
+ "though earlier partitions have been lost. Note that
intra prediction" \
" is still done over the partition boundary.",
0, AV_OPT_TYPE_CONST, {.i64 = VPX_ERROR_RESILIENT_PARTITIONS}, 0, 0, VE, "er"},
\
{ "crf", "Select the quality for constant quality mode",
offsetof(VPxContext, crf), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 63, VE }, \
{ "static-thresh","A change threshold on blocks below which they will
be skipped by the encoder", OFFSET(static_thresh), AV_OPT_TYPE_INT, { .i64 = 0
}, 0, INT_MAX, VE }, \
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/libvpxdec.c,cosmetics: bpp -> bpc
ffmpeg | branch: master | James Zern | Wed Nov 6 14:05:23
2019 -0800| [a6be42a733133a5aff3129dace8b474d2d3f57aa] | committer: James Zern
avcodec/libvpxdec.c,cosmetics: bpp -> bpc
Signed-off-by: James Zern
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a6be42a733133a5aff3129dace8b474d2d3f57aa
---
libavcodec/libvpxdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c
index 1ae2361167..1063c546b0 100644
--- a/libavcodec/libvpxdec.c
+++ b/libavcodec/libvpxdec.c
@@ -288,7 +288,7 @@ static int vpx_decode(AVCodecContext *avctx,
img->d_h != img_alpha->d_h ||
img->bit_depth != img_alpha->bit_depth)) {
av_log(avctx, AV_LOG_ERROR,
- "Video dimensions %dx%d@%dbpp differ from alpha dimensions
%dx%d@%dbpp\n",
+ "Video dimensions %dx%d@%dbpc differ from alpha dimensions
%dx%d@%dbpc\n",
img->d_w, img->d_h, img->bit_depth,
img_alpha->d_w, img_alpha->d_h, img_alpha->bit_depth);
return AVERROR_INVALIDDATA;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/Makefile: add missing framesync dependency to bm3d & mix filters
ffmpeg | branch: master | Lou Logan | Wed Nov 6 10:37:09 2019 -0900| [007e03348dbd8d3de3eb09022d72c734a8608144] | committer: Lou Logan avfilter/Makefile: add missing framesync dependency to bm3d & mix filters Signed-off-by: Lou Logan > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=007e03348dbd8d3de3eb09022d72c734a8608144 --- libavfilter/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 3eff398860..fce930360d 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -169,7 +169,7 @@ OBJS-$(CONFIG_BITPLANENOISE_FILTER) += vf_bitplanenoise.o OBJS-$(CONFIG_BLACKDETECT_FILTER)+= vf_blackdetect.o OBJS-$(CONFIG_BLACKFRAME_FILTER) += vf_blackframe.o OBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o framesync.o -OBJS-$(CONFIG_BM3D_FILTER) += vf_bm3d.o +OBJS-$(CONFIG_BM3D_FILTER) += vf_bm3d.o framesync.o OBJS-$(CONFIG_BOXBLUR_FILTER)+= vf_boxblur.o boxblur.o OBJS-$(CONFIG_BOXBLUR_OPENCL_FILTER) += vf_avgblur_opencl.o opencl.o \ opencl/avgblur.o boxblur.o @@ -304,7 +304,7 @@ OBJS-$(CONFIG_MESTIMATE_FILTER) += vf_mestimate.o motion_estimation OBJS-$(CONFIG_METADATA_FILTER) += f_metadata.o OBJS-$(CONFIG_MIDEQUALIZER_FILTER) += vf_midequalizer.o framesync.o OBJS-$(CONFIG_MINTERPOLATE_FILTER) += vf_minterpolate.o motion_estimation.o -OBJS-$(CONFIG_MIX_FILTER)+= vf_mix.o +OBJS-$(CONFIG_MIX_FILTER)+= vf_mix.o framesync.o OBJS-$(CONFIG_MPDECIMATE_FILTER) += vf_mpdecimate.o OBJS-$(CONFIG_NEGATE_FILTER) += vf_lut.o OBJS-$(CONFIG_NLMEANS_FILTER)+= vf_nlmeans.o ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] configure: select missing rdft for several filters
ffmpeg | branch: master | Lou Logan | Wed Nov 6 10:35:28 2019 -0900| [5896411437505bccb4d3581f41e058c42f596254] | committer: Lou Logan configure: select missing rdft for several filters afir, sinc, superequalizer, surround For afir fft is replaced with rdft as: rdft_select="fft" Signed-off-by: Lou Logan > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5896411437505bccb4d3581f41e058c42f596254 --- configure | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 0dcd234245..48e1426013 100755 --- a/configure +++ b/configure @@ -3437,7 +3437,7 @@ afftdn_filter_select="fft" afftfilt_filter_deps="avcodec" afftfilt_filter_select="fft" afir_filter_deps="avcodec" -afir_filter_select="fft" +afir_filter_select="rdft" amovie_filter_deps="avcodec avformat" aresample_filter_deps="swresample" asr_filter_deps="pocketsphinx" @@ -3546,6 +3546,7 @@ showspectrum_filter_select="fft" showspectrumpic_filter_deps="avcodec" showspectrumpic_filter_select="fft" signature_filter_deps="gpl avcodec avformat" +sinc_filter_select="rdft" smartblur_filter_deps="gpl swscale" sobel_opencl_filter_deps="opencl" sofalizer_filter_deps="libmysofa avcodec" @@ -3560,6 +3561,8 @@ stereo3d_filter_deps="gpl" subtitles_filter_deps="avformat avcodec libass" super2xsai_filter_deps="gpl" pixfmts_super2xsai_test_deps="super2xsai_filter" +superequalizer_filter_select="rdft" +surround_filter_select="rdft" tinterlace_filter_deps="gpl" tinterlace_merge_test_deps="tinterlace_filter" tinterlace_pad_test_deps="tinterlace_filter" ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_dnn_processing: correct duplicate statement
ffmpeg | branch: master | leozhang | Fri Nov 8 11:55:10
2019 +0800| [c79307b7de9c562c10d45eda2ac58d5d5262e666] | committer: Michael
Niedermayer
avfilter/vf_dnn_processing: correct duplicate statement
Signed-off-by: leozhang
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c79307b7de9c562c10d45eda2ac58d5d5262e666
---
libavfilter/vf_dnn_processing.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavfilter/vf_dnn_processing.c b/libavfilter/vf_dnn_processing.c
index a916d38ec1..f59cfb0da2 100644
--- a/libavfilter/vf_dnn_processing.c
+++ b/libavfilter/vf_dnn_processing.c
@@ -204,7 +204,7 @@ static int config_output(AVFilterLink *outlink)
static int copy_from_frame_to_dnn(DNNData *dnn_data, const AVFrame *in)
{
// extend this function to support more formats
-av_assert0(in->format == AV_PIX_FMT_RGB24 || in->format ==
AV_PIX_FMT_RGB24);
+av_assert0(in->format == AV_PIX_FMT_RGB24 || in->format ==
AV_PIX_FMT_BGR24);
if (dnn_data->dt == DNN_FLOAT) {
float *dnn_input = dnn_data->data;
@@ -233,7 +233,7 @@ static int copy_from_frame_to_dnn(DNNData *dnn_data, const
AVFrame *in)
static int copy_from_dnn_to_frame(AVFrame *out, const DNNData *dnn_data)
{
// extend this function to support more formats
-av_assert0(out->format == AV_PIX_FMT_RGB24 || out->format ==
AV_PIX_FMT_RGB24);
+av_assert0(out->format == AV_PIX_FMT_RGB24 || out->format ==
AV_PIX_FMT_BGR24);
if (dnn_data->dt == DNN_FLOAT) {
float *dnn_output = dnn_data->data;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_dnn_processing: fix fate-source
ffmpeg | branch: master | Guo, Yejun | Fri Nov 8
15:51:40 2019 +0800| [f6e942251c59239520da3e541dc2e0d785a94bad] | committer:
Michael Niedermayer
avfilter/vf_dnn_processing: fix fate-source
Signed-off-by: Guo, Yejun
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6e942251c59239520da3e541dc2e0d785a94bad
---
libavfilter/vf_dnn_processing.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/vf_dnn_processing.c b/libavfilter/vf_dnn_processing.c
index 87ad354ba6..a916d38ec1 100644
--- a/libavfilter/vf_dnn_processing.c
+++ b/libavfilter/vf_dnn_processing.c
@@ -241,7 +241,7 @@ static int copy_from_dnn_to_frame(AVFrame *out, const
DNNData *dnn_data)
for(int j = 0; j < out->width * 3; j++) {
int k = i * out->linesize[0] + j;
int t = i * out->width * 3 + j;
-out->data[0][k] = av_clip((int)(dnn_output[t] * 255.0f), 0,
255);
+out->data[0][k] = av_clip_uintp2((int)(dnn_output[t] *
255.0f), 8);
}
}
} else {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avformat/mxfdec: cleanup on "essence prior to first PartitionPack"
ffmpeg | branch: master | Michael Niedermayer | Thu
Oct 31 13:30:52 2019 +0100| [9802599ad0bef067d50ffc00b5e6b928589a7dd6] |
committer: Michael Niedermayer
avformat/mxfdec: cleanup on "essence prior to first PartitionPack"
Fixes: memleak
Fixes:
18473/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5738557074833408
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9802599ad0bef067d50ffc00b5e6b928589a7dd6
---
libavformat/mxfdec.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 397f820b3f..bcee234ad7 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -3169,6 +3169,7 @@ static int mxf_read_header(AVFormatContext *s)
if (!mxf_read_sync(s->pb, mxf_header_partition_pack_key, 14)) {
av_log(s, AV_LOG_ERROR, "could not find header partition pack key\n");
+//goto fail should not be needed as no metadata sets will have been
parsed yet
return AVERROR_INVALIDDATA;
}
avio_seek(s->pb, -14, SEEK_CUR);
@@ -3199,7 +3200,8 @@ static int mxf_read_header(AVFormatContext *s)
if (!mxf->current_partition) {
av_log(mxf->fc, AV_LOG_ERROR, "found essence prior to first
PartitionPack\n");
-return AVERROR_INVALIDDATA;
+ret = AVERROR_INVALIDDATA;
+goto fail;
}
if (!mxf->current_partition->first_essence_klv.offset)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/f_metadata: remove unneeded code
ffmpeg | branch: master | Limin Wang | Thu Oct 10
14:03:54 2019 +0800| [81271b3cce3dea9543feb13d41f6ab285d19b770] | committer:
Steven Liu
avfilter/f_metadata: remove unneeded code
Reviewed-by: Steven Liu
Signed-off-by: Limin Wang
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81271b3cce3dea9543feb13d41f6ab285d19b770
---
libavfilter/f_metadata.c | 4
1 file changed, 4 deletions(-)
diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c
index 2ed1393cba..3bf4bb17f5 100644
--- a/libavfilter/f_metadata.c
+++ b/libavfilter/f_metadata.c
@@ -320,13 +320,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame
*frame)
av_dict_set(metadata, s->key, s->value, 0);
}
return ff_filter_frame(outlink, frame);
-break;
case METADATA_MODIFY:
if (e && e->value) {
av_dict_set(metadata, s->key, s->value, 0);
}
return ff_filter_frame(outlink, frame);
-break;
case METADATA_PRINT:
if (!s->key && e) {
s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%s\n",
@@ -341,7 +339,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame
*frame)
s->print(ctx, "%s=%s\n", s->key, e->value);
}
return ff_filter_frame(outlink, frame);
-break;
case METADATA_DELETE:
if (!s->key) {
av_dict_free(metadata);
@@ -349,7 +346,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame
*frame)
av_dict_set(metadata, s->key, NULL, 0);
}
return ff_filter_frame(outlink, frame);
-break;
default:
av_assert0(0);
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
