[FFmpeg-cvslog] avfilter/vf_dnn_processing: correct duplicate statement

leozhang git at videolan.org
Fri Nov 8 16:55:37 EET 2019


ffmpeg | branch: master | leozhang <leozhang at qiyi.com> | Fri Nov  8 11:55:10 2019 +0800| [c79307b7de9c562c10d45eda2ac58d5d5262e666] | committer: Michael Niedermayer

avfilter/vf_dnn_processing: correct duplicate statement

Signed-off-by: leozhang <leozhang at qiyi.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> 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;



More information about the ffmpeg-cvslog mailing list