| Message ID | 1538298911-27149-1-git-send-email-zhong.li@intel.com |
|---|---|
| State | Accepted |
| Commit | 21733b39d0af5211d7b9f168ff3667ea86362e2b |
| Headers | show |
On Sun, Sep 30, 2018 at 11:14 AM Zhong Li <zhong.li@intel.com> wrote: > Variable 'ret' hasn't been initialized，thus introducing a random > hwupload failure regression due to qsv session uninitialized. > > Signed-off-by: Zhong Li <zhong.li@intel.com> > --- > libavutil/hwcontext_qsv.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c > index cb3e184..33e121b 100644 > --- a/libavutil/hwcontext_qsv.c > +++ b/libavutil/hwcontext_qsv.c > @@ -861,7 +861,7 @@ static int qsv_transfer_data_to(AVHWFramesContext > *ctx, AVFrame *dst, > > mfxSyncPoint sync = NULL; > mfxStatus err; > - int ret; > + int ret = 0; > > while (!s->session_upload_init && !s->session_upload && !ret) { > #if HAVE_PTHREADS > -- > 2.7.4 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel LGTM regards Max
On Sun, 2018-09-30 at 17:15 +0800, Zhong Li wrote: > Variable 'ret' hasn't been initialized，thus introducing a random > hwupload failure regression due to qsv session uninitialized. > > Signed-off-by: Zhong Li <zhong.li@intel.com> > --- > libavutil/hwcontext_qsv.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c > index cb3e184..33e121b 100644 > --- a/libavutil/hwcontext_qsv.c > +++ b/libavutil/hwcontext_qsv.c > @@ -861,7 +861,7 @@ static int qsv_transfer_data_to(AVHWFramesContext > *ctx, AVFrame *dst, > > mfxSyncPoint sync = NULL; > mfxStatus err; > - int ret; > + int ret = 0; > > while (!s->session_upload_init && !s->session_upload && !ret) { > #if HAVE_PTHREADS Works on my side and fixes an issue with hwupload which I saw. Can, please, this be merged?
diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index cb3e184..33e121b 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -861,7 +861,7 @@ static int qsv_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst, mfxSyncPoint sync = NULL; mfxStatus err; - int ret; + int ret = 0; while (!s->session_upload_init && !s->session_upload && !ret) { #if HAVE_PTHREADS
Variable 'ret' hasn't been initialized，thus introducing a random hwupload failure regression due to qsv session uninitialized. Signed-off-by: Zhong Li <zhong.li@intel.com> --- libavutil/hwcontext_qsv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)