[FFmpeg-devel] Merge commit of libav f8c34f4b8d62afad3f63cf3d9617d73735bef8c1

Mats Peterson matsp888 at yahoo.com
Mon Mar 14 11:30:17 CET 2016


On 03/14/2016 11:25 AM, Michael Niedermayer wrote:
> On Mon, Mar 14, 2016 at 10:09:29AM +0100, Mats Peterson wrote:
>> On 03/14/2016 09:53 AM, Mats Peterson wrote:
>>> Mats Peterson <matsp888-at-yahoo.com at ffmpeg.org> skrev: (14 mars 2016 09:52:16 CET)
>>>> Hendrik Leppkes <h.leppkes at gmail.com> skrev: (14 mars 2016 09:31:17
>>>> CET)
>>>>> On Mon, Mar 14, 2016 at 5:25 AM, Mats Peterson
>>>>> <matsp888-at-yahoo.com at ffmpeg.org> wrote:
>>>>>> Luca Barbato from the libav project has apparently fixed the banding
>>>>>> artifacts in Intel Video. Now I don't know how to contribute a merge
>>>>> commit.
>>>>>> I would be thankful for some help, or if someone else would be
>>>>> willing to
>>>>>> apply this one.
>>>>>>
>>>>>> Libav commit ID is f8c34f4b8d62afad3f63cf3d9617d73735bef8c1 once
>>>>> again.
>>>>>>
>>>>>
>>>>> Commits are merged in sequence, it will be handled once the more
>>>>> complicated change in front of it are merged, there is nothing else to
>>>>> do.
>>>>>
>>>>> - Hendrik
>>>>> _______________________________________________
>>>>> ffmpeg-devel mailing list
>>>>> ffmpeg-devel at ffmpeg.org
>>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>>>
>>>> OK. I read somewhere that all avilib commits are merged (unless they
>>>> cause problems, of course). This is a no-brainer, though. But I guess
>>>> I'll just have to wait.
>>>>
>>>> Mats
>>>> --
>>>> Mats Peterson
>>>> http://matsp888.no-ip.org/~mats/
>>>> _______________________________________________
>>>> ffmpeg-devel mailing list
>>>> ffmpeg-devel at ffmpeg.org
>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>>
>>> libav, not avilib. That's somethiing else :-)
>>>
>>
>> Would it be OK for me to create a patch, as long as I attribute Luca
>> Barbato in some way?
>
> if you want to do the extra work, the change is the same and correctly
> attributed (see git cherry-pick and git commit --author) then i see no
> problem here
>
> Note, its important that the change is the same and not "re created"
> so that you help the people doing the next merge by reducing their work
> (aka they can then just "skip" the commit when merging and dont need to
> spend time analysing why the change is different)
> If differences are neccessary they should be fully documented in the
> commit message
>
>

No differences are necessary whatsoever. I copied the two files from 
libav to the libavcodec directory in FFmpeg, and it compiles cleanly.

Is it OK to just copy the files, like I did when testing, and then 
attribute the author with --author?

Mats




More information about the ffmpeg-devel mailing list