diff mbox

[FFmpeg-devel] avcodec/mediacodec: Factor duplicate include

Message ID 20161016145210.25762-1-michael@niedermayer.cc
State Accepted
Commit 9545ff3ec39177f429c644128bf8cb0034e2a18b
Headers show

Commit Message

Michael Niedermayer Oct. 16, 2016, 2:52 p.m. UTC 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/mediacodec.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Matthieu Bouron Oct. 17, 2016, 5:43 a.m. UTC | #1 
On Sun, Oct 16, 2016 at 04:52:10PM +0200, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/mediacodec.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/libavcodec/mediacodec.c b/libavcodec/mediacodec.c
> index a658f0e..37008e0 100644
> --- a/libavcodec/mediacodec.c
> +++ b/libavcodec/mediacodec.c
> @@ -24,6 +24,8 @@
>  
>  #include "libavutil/error.h"
>  
> +#include "mediacodec.h"
> +
>  #if CONFIG_H264_MEDIACODEC_HWACCEL
>  
>  #include <jni.h>
> @@ -33,7 +35,6 @@
>  #include "libavutil/mem.h"
>  
>  #include "ffjni.h"
> -#include "mediacodec.h"
>  #include "mediacodecdec.h"
>  
>  AVMediaCodecContext *av_mediacodec_alloc_context(void)
> @@ -101,8 +102,6 @@ int av_mediacodec_release_buffer(AVMediaCodecBuffer *buffer, int render)
>  
>  #include <stdlib.h>
>  
> -#include "mediacodec.h"
> -
>  AVMediaCodecContext *av_mediacodec_alloc_context(void)
>  {
>      return NULL;
> -- 
> 2.10.1

LGTM.

Thanks,
Matthieu

[...]
Matthieu Bouron Oct. 18, 2016, 1:42 p.m. UTC | #2 
On Mon, Oct 17, 2016 at 07:43:37AM +0200, Matthieu Bouron wrote:
> On Sun, Oct 16, 2016 at 04:52:10PM +0200, Michael Niedermayer wrote:
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/mediacodec.c | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/libavcodec/mediacodec.c b/libavcodec/mediacodec.c
> > index a658f0e..37008e0 100644
> > --- a/libavcodec/mediacodec.c
> > +++ b/libavcodec/mediacodec.c
> > @@ -24,6 +24,8 @@
> >  
> >  #include "libavutil/error.h"
> >  
> > +#include "mediacodec.h"
> > +
> >  #if CONFIG_H264_MEDIACODEC_HWACCEL
> >  
> >  #include <jni.h>
> > @@ -33,7 +35,6 @@
> >  #include "libavutil/mem.h"
> >  
> >  #include "ffjni.h"
> > -#include "mediacodec.h"
> >  #include "mediacodecdec.h"
> >  
> >  AVMediaCodecContext *av_mediacodec_alloc_context(void)
> > @@ -101,8 +102,6 @@ int av_mediacodec_release_buffer(AVMediaCodecBuffer *buffer, int render)
> >  
> >  #include <stdlib.h>
> >  
> > -#include "mediacodec.h"
> > -
> >  AVMediaCodecContext *av_mediacodec_alloc_context(void)
> >  {
> >      return NULL;
> > -- 
> > 2.10.1
> 
> LGTM.

Applied.

[...]
diff mbox

Patch

diff --git a/libavcodec/mediacodec.c b/libavcodec/mediacodec.c
index a658f0e..37008e0 100644
--- a/libavcodec/mediacodec.c
+++ b/libavcodec/mediacodec.c
@@ -24,6 +24,8 @@ 
 
 #include "libavutil/error.h"
 
+#include "mediacodec.h"
+
 #if CONFIG_H264_MEDIACODEC_HWACCEL
 
 #include <jni.h>
@@ -33,7 +35,6 @@ 
 #include "libavutil/mem.h"
 
 #include "ffjni.h"
-#include "mediacodec.h"
 #include "mediacodecdec.h"
 
 AVMediaCodecContext *av_mediacodec_alloc_context(void)
@@ -101,8 +102,6 @@  int av_mediacodec_release_buffer(AVMediaCodecBuffer *buffer, int render)
 
 #include <stdlib.h>
 
-#include "mediacodec.h"
-
 AVMediaCodecContext *av_mediacodec_alloc_context(void)
 {
     return NULL;