On Mon, Feb 25, 2013 at 04:55:08PM +0100, Diego Biurrun wrote:
> (cherry picked from commit a519463366238a7ec05d2bb76c4a67f42cf60ece)
> 
> Conflicts:
> 
>       libavcodec/Makefile
> ---
> 
> ... and now hopefully correctly cherry-picked ...

guess again
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to