On 8/2/2016 7:28 PM, Timothy Gu wrote: > --- > libavcodec/jni.c | 9 ++++----- > libavcodec/mediacodec.c | 6 ++++-- > 2 files changed, 8 insertions(+), 7 deletions(-) > I'd say split this in two patches, so you can easily cherry-pick the jni part for release branches 3.0 and 3.1.