[FFmpeg-devel] [PATCH] avfilter/vf_dnn_processing: correct duplicate statement

[Michael Niedermayer]

On Fri, Nov 08, 2019 at 04:34:01AM +0000, Guo, Yejun wrote:
> 
> 
> > -----Original Message-----
> > From: ffmpeg-devel [mailto:ffmpeg-devel-bounces at ffmpeg.org] On Behalf Of
> > leozhang
> > Sent: Friday, November 08, 2019 11:55 AM
> > To: ffmpeg-devel at ffmpeg.org
> > Subject: [FFmpeg-devel] [PATCH] avfilter/vf_dnn_processing: correct duplicate
> > statement
> > 
> > Signed-off-by: leozhang <leozhang at qiyi.com>
> > ---
> >  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 87ad354..e119f4d 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;
> > --
> 
> yes, thanks for the catch.

applied

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The real ebay dictionary, page 1
"Used only once"    - "Some unspecified defect prevented a second use"
"In good condition" - "Can be repaird by experienced expert"
"As is" - "You wouldnt want it even if you were payed for it, if you knew ..."
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20191108/c809e82b/attachment.sig>