| Message ID | 1470176890-11990-1-git-send-email-timothygu99@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Context | Check | Description |
|---|---|---|
| Timothy_Gu/b'default' | success | |
| Timothy_Gu/FATE | success | FFmpeg test suite |
On Tue, Aug 02, 2016 at 03:28:10PM -0700, Timothy Gu wrote: > --- > libavcodec/jni.c | 9 ++++----- > libavcodec/mediacodec.c | 6 ++++-- > 2 files changed, 8 insertions(+), 7 deletions(-) builds on all systems that are easy testable here [...]
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.
On Tue, Aug 2, 2016 at 6:30 PM James Almer <jamrial@gmail.com> wrote: > 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. > Done locally. Thanks for noticing. Timothy
On Tue, Aug 2, 2016 at 8:42 PM Timothy Gu <timothygu99@gmail.com> wrote: > On Tue, Aug 2, 2016 at 6:30 PM James Almer <jamrial@gmail.com> wrote: > >> 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. >> > > Done locally. Thanks for noticing. > Split up and pushed. Timothy
diff --git a/libavcodec/jni.c b/libavcodec/jni.c index 32456f5..85dcf2a 100644 --- a/libavcodec/jni.c +++ b/libavcodec/jni.c @@ -20,19 +20,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" + #include <stdlib.h> -#include "config.h" +#include "libavutil/error.h" #include "jni.h" #if CONFIG_JNI - -#include <errno.h> #include <jni.h> #include <pthread.h> #include "libavutil/log.h" -#include "libavutil/error.h" #include "ffjni.h" void *java_vm; @@ -69,7 +68,7 @@ void *av_jni_get_java_vm(void *log_ctx) int av_jni_set_java_vm(void *vm, void *log_ctx) { - return 0; + return AVERROR(ENOSYS); } void *av_jni_get_java_vm(void *log_ctx) diff --git a/libavcodec/mediacodec.c b/libavcodec/mediacodec.c index cd8766f..a658f0e 100644 --- a/libavcodec/mediacodec.c +++ b/libavcodec/mediacodec.c @@ -22,6 +22,8 @@ #include "config.h" +#include "libavutil/error.h" + #if CONFIG_H264_MEDIACODEC_HWACCEL #include <jni.h> @@ -108,7 +110,7 @@ AVMediaCodecContext *av_mediacodec_alloc_context(void) int av_mediacodec_default_init(AVCodecContext *avctx, AVMediaCodecContext *ctx, void *surface) { - return 0; + return AVERROR(ENOSYS); } void av_mediacodec_default_free(AVCodecContext *avctx) @@ -117,7 +119,7 @@ void av_mediacodec_default_free(AVCodecContext *avctx) int av_mediacodec_release_buffer(AVMediaCodecBuffer *buffer, int render) { - return 0; + return AVERROR(ENOSYS); } #endif