[FFmpeg-devel] libavutil/opencl: output program build log

[Wei Gao]

2014-12-29 10:10 GMT+08:00 Wei Gao <highgod0401 at gmail.com>:

>
>
> 2014-12-25 4:34 GMT+08:00 Michael Niedermayer <michaelni at gmx.at>:
>
>> On Wed, Dec 24, 2014 at 07:55:13PM +0000, Titov, Alexey wrote:
>> > Attached corrected patch
>>
>> should be ok
>> if wei gao is ok with it then i can apply it
>>
> Hi, I tried to merge the three patches on mingw, but seems some errors,
> the log is as follow.
>
> Administrator at MCW-HIGHGOD
> /E/ffmpeg/ffmpeg_submit/ffmpeg_updata/ffmpeg_unsharp
> master)
> $ git am 0001-libavfilter-unsharpen-opencl-filter-optimizations.patch
> Applying: libavfilter: unsharpen opencl filter optimizations
>
> Administrator at MCW-HIGHGOD
> /E/ffmpeg/ffmpeg_submit/ffmpeg_updata/ffmpeg_unsharp
> master)
> $ git am 0002-Fixed-the-patch-according-to-the-suggestions.patch
> Applying: Fixed the patch according to the suggestions
>
> e:/ffmpeg/ffmpeg_submit/ffmpeg_updata/ffmpeg_unsharp/.git/rebase-apply/patch:10
> : trailing whitespace.
>
> warning: 1 line adds whitespace errors.
>
> Administrator at MCW-HIGHGOD
> /E/ffmpeg/ffmpeg_submit/ffmpeg_updata/ffmpeg_unsharp
> master)
> $ git am 0001-libavutil-opencl-output-program-build-failure-log.patch
> Applying: libavutil/opencl: output program build failure log
>
> e:/ffmpeg/ffmpeg_submit/ffmpeg_updata/ffmpeg_unsharp/.git/rebase-apply/patch:44
>  trailing whitespace.
>
> error: patch failed: libavutil/opencl.c:449
> error: libavutil/opencl.c: patch does not apply
> error: patch failed: libavutil/opencl.h:51
> error: libavutil/opencl.h: patch does not apply
> Patch failed at 0001 libavutil/opencl: output program build failure log
> When you have resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort".
>
> Thanks
> Best regards
>
Hi

The base version is  as follow

commit 202947a0665ea523022afb0a6c50eed96bcd6b69
Author: Pedro E. M. Brito <pedroembrito at gmail.com>
Date:   Sun Dec 28 05:35:34 2014 -0200

    libavformat/segment.c: Add strftime expansion for segment filename
templates

    Allows expansion of the filename template with strftime() with the
option
    -strftime 1 (disabled by default). This allows segments to be named by
time
    creation, adding some flexibility.

    Fixes Ticket 4104 (add strftime to segment muxer)

    Signed-off-by: Pedro E. M. Brito <pedroembrito at gmail.com>
    Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
-------------------------------------------------------------------------------------------------------

Administrator at MCW-HIGHGOD
/E/ffmpeg/ffmpeg_submit/ffmpeg_updata/ffmpeg_unsharp (
master|AM)
$ git log
commit 76ee532ff2443842ec0a8c9a0527dc9266a65ff5
Author: atitov <alexey.titov at amd.com>
Date:   Tue Dec 23 13:16:35 2014 -0800

    Fixed the patch according to the suggestions

    build log is now capped and is using av_log, other issues are fixed

commit 08e07370f59f862efaedf12d9eb7962c9f5556d6
Author: atitov <alexey.titov at amd.com>
Date:   Wed Dec 17 16:02:17 2014 -0800

    libavfilter: unsharpen opencl filter optimizations

commit 202947a0665ea523022afb0a6c50eed96bcd6b69
Author: Pedro E. M. Brito <pedroembrito at gmail.com>
Date:   Sun Dec 28 05:35:34 2014 -0200

    libavformat/segment.c: Add strftime expansion for segment filename
templates

    Allows expansion of the filename template with strftime() with the
option
    -strftime 1 (disabled by default). This allows segments to be named by
time
    creation, adding some flexibility.

    Fixes Ticket 4104 (add strftime to segment muxer)

    Signed-off-by: Pedro E. M. Brito <pedroembrito at gmail.com>
    Signed-off-by: Michael Niedermayer <michaelni at gmx.at>



>
>>
>> [...]
>>
>> --
>> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>>
>> I have never wished to cater to the crowd; for what I know they do not
>> approve, and what they approve I do not know. -- Epicurus
>>
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel at ffmpeg.org
>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>>
>