diff mbox

[FFmpeg-devel,2/2] lavc/mediacodecdec_h264: use h264_parse.h instead of h264dec.h

Message ID 20160905135754.27226-2-matthieu.bouron@gmail.com
State Accepted
Commit 4b290078e4c6ab48847cb65b9ff48b720a5ac8d6
Headers show

Commit Message

Matthieu Bouron Sept. 5, 2016, 1:57 p.m. UTC 
From: Matthieu Bouron <matthieu.bouron@stupeflix.com>

ff_h264_decode_extradata is referenced by h264_parse.h and not
h264dec.h.
---
 libavcodec/mediacodecdec_h264.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Matthieu Bouron Sept. 7, 2016, 1:38 p.m. UTC | #1 
On Mon, Sep 05, 2016 at 03:57:54PM +0200, Matthieu Bouron wrote:
> From: Matthieu Bouron <matthieu.bouron@stupeflix.com>
> 
> ff_h264_decode_extradata is referenced by h264_parse.h and not
> h264dec.h.
> ---
>  libavcodec/mediacodecdec_h264.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/mediacodecdec_h264.c b/libavcodec/mediacodecdec_h264.c
> index 9b71561..a141174 100644
> --- a/libavcodec/mediacodecdec_h264.c
> +++ b/libavcodec/mediacodecdec_h264.c
> @@ -32,7 +32,7 @@
>  #include "libavutil/atomic.h"
>  
>  #include "avcodec.h"
> -#include "h264dec.h"
> +#include "h264_parse.h"
>  #include "internal.h"
>  #include "mediacodecdec.h"
>  #include "mediacodec_wrapper.h"

I will apply the patchset in a few hours if there is no objection.

Matthieu

[...]
Thomas Volkert Sept. 7, 2016, 6:19 p.m. UTC | #2 
On 07.09.2016 15:38, Matthieu Bouron wrote:
> On Mon, Sep 05, 2016 at 03:57:54PM +0200, Matthieu Bouron wrote:
>> From: Matthieu Bouron <matthieu.bouron@stupeflix.com>
>>
>> ff_h264_decode_extradata is referenced by h264_parse.h and not
>> h264dec.h.
>> ---
>>   libavcodec/mediacodecdec_h264.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/libavcodec/mediacodecdec_h264.c b/libavcodec/mediacodecdec_h264.c
>> index 9b71561..a141174 100644
>> --- a/libavcodec/mediacodecdec_h264.c
>> +++ b/libavcodec/mediacodecdec_h264.c
>> @@ -32,7 +32,7 @@
>>   #include "libavutil/atomic.h"
>>   
>>   #include "avcodec.h"
>> -#include "h264dec.h"
>> +#include "h264_parse.h"
>>   #include "internal.h"
>>   #include "mediacodecdec.h"
>>   #include "mediacodec_wrapper.h"
> I will apply the patchset in a few hours if there is no objection.
>

Okay.

Best regards,
Thomas.
Elijah Tully Sept. 7, 2016, 6:42 p.m. UTC | #3 
sounds good thanks

On Wed, Sep 7, 2016 at 2:19 PM, Thomas Volkert <silvo@gmx.net> wrote:

>
> On 07.09.2016 15:38, Matthieu Bouron wrote:
>
>> On Mon, Sep 05, 2016 at 03:57:54PM +0200, Matthieu Bouron wrote:
>>
>>> From: Matthieu Bouron <matthieu.bouron@stupeflix.com>
>>>
>>> ff_h264_decode_extradata is referenced by h264_parse.h and not
>>> h264dec.h.
>>> ---
>>>   libavcodec/mediacodecdec_h264.c | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/libavcodec/mediacodecdec_h264.c
>>> b/libavcodec/mediacodecdec_h264.c
>>> index 9b71561..a141174 100644
>>> --- a/libavcodec/mediacodecdec_h264.c
>>> +++ b/libavcodec/mediacodecdec_h264.c
>>> @@ -32,7 +32,7 @@
>>>   #include "libavutil/atomic.h"
>>>     #include "avcodec.h"
>>> -#include "h264dec.h"
>>> +#include "h264_parse.h"
>>>   #include "internal.h"
>>>   #include "mediacodecdec.h"
>>>   #include "mediacodec_wrapper.h"
>>>
>> I will apply the patchset in a few hours if there is no objection.
>>
>>
> Okay.
>
> Best regards,
> Thomas.
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
Matthieu Bouron Sept. 7, 2016, 7:08 p.m. UTC | #4 
On Wed, Sep 07, 2016 at 08:19:15PM +0200, Thomas Volkert wrote:
> 
> On 07.09.2016 15:38, Matthieu Bouron wrote:
> > On Mon, Sep 05, 2016 at 03:57:54PM +0200, Matthieu Bouron wrote:
> > > From: Matthieu Bouron <matthieu.bouron@stupeflix.com>
> > > 
> > > ff_h264_decode_extradata is referenced by h264_parse.h and not
> > > h264dec.h.
> > > ---
> > >   libavcodec/mediacodecdec_h264.c | 2 +-
> > >   1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/libavcodec/mediacodecdec_h264.c b/libavcodec/mediacodecdec_h264.c
> > > index 9b71561..a141174 100644
> > > --- a/libavcodec/mediacodecdec_h264.c
> > > +++ b/libavcodec/mediacodecdec_h264.c
> > > @@ -32,7 +32,7 @@
> > >   #include "libavutil/atomic.h"
> > >   #include "avcodec.h"
> > > -#include "h264dec.h"
> > > +#include "h264_parse.h"
> > >   #include "internal.h"
> > >   #include "mediacodecdec.h"
> > >   #include "mediacodec_wrapper.h"
> > I will apply the patchset in a few hours if there is no objection.
> > 
> 
> Okay.

Pushed. Thanks.

[...]
diff mbox

Patch

diff --git a/libavcodec/mediacodecdec_h264.c b/libavcodec/mediacodecdec_h264.c
index 9b71561..a141174 100644
--- a/libavcodec/mediacodecdec_h264.c
+++ b/libavcodec/mediacodecdec_h264.c
@@ -32,7 +32,7 @@ 
 #include "libavutil/atomic.h"
 
 #include "avcodec.h"
-#include "h264dec.h"
+#include "h264_parse.h"
 #include "internal.h"
 #include "mediacodecdec.h"
 #include "mediacodec_wrapper.h"