diff mbox

[FFmpeg-devel] lavc/ffjni: do not error out if the last non-mandatory field/method cannot be found

Message ID 20160909144000.4493-1-matthieu.bouron@gmail.com
State Accepted
Commit 025f75c3ad1a4efc013bf3656b78952480fb90f7
Headers show

Commit Message

Matthieu Bouron Sept. 9, 2016, 2:40 p.m. UTC 
From: Matthieu Bouron <matthieu.bouron@stupeflix.com>

---
 libavcodec/ffjni.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Michael Niedermayer Sept. 11, 2016, 9:47 p.m. UTC | #1 
On Fri, Sep 09, 2016 at 04:40:00PM +0200, Matthieu Bouron wrote:
> From: Matthieu Bouron <matthieu.bouron@stupeflix.com>
> 
> ---
>  libavcodec/ffjni.c | 2 ++
>  1 file changed, 2 insertions(+)

LGTM

thx

[...]
Matthieu Bouron Sept. 12, 2016, 7:57 a.m. UTC | #2 
On Sun, Sep 11, 2016 at 11:47:29PM +0200, Michael Niedermayer wrote:
> On Fri, Sep 09, 2016 at 04:40:00PM +0200, Matthieu Bouron wrote:
> > From: Matthieu Bouron <matthieu.bouron@stupeflix.com>
> > 
> > ---
> >  libavcodec/ffjni.c | 2 ++
> >  1 file changed, 2 insertions(+)
> 
> LGTM

Pushed. Thanks.

Matthieu
[...]
diff mbox

Patch

diff --git a/libavcodec/ffjni.c b/libavcodec/ffjni.c
index 13eabb0..0597400 100644
--- a/libavcodec/ffjni.c
+++ b/libavcodec/ffjni.c
@@ -352,6 +352,8 @@  int ff_jni_init_jfields(JNIEnv *env, void *jfields, const struct FFJniField *jfi
                 ret = AVERROR(EINVAL);
                 goto done;
             }
+
+            ret = 0;
         }
     }