On Tue, Sep 16, 2014 at 9:52 AM, Diego Biurrun <[email protected]> wrote:
> (cherry picked from commit 65345a5a30a0e866b6944c0e6184be3feca04335)
> Signed-off-by: Diego Biurrun <[email protected]>
>
> Conflicts:
>         libavutil/cpu.c
>         libavutil/cpu.h
> ---
>

I think it might be ok.
Vittorio
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to