[FFmpeg-devel] [PATCH 1/2] vc1: implement vc1 field interlaced dxva2 decoding

[Michael Niedermayer]

On Sun, Sep 23, 2012 at 02:41:38PM +0200, Hendrik Leppkes wrote:
> ---
>  libavcodec/dxva2_vc1.c |    7 +++++--
>  libavcodec/vc1dec.c    |   52 +++++++++++++++++++++++++++++++++++++++++-------
>  2 files changed, 50 insertions(+), 9 deletions(-)

Applying: vc1: implement vc1 field interlaced dxva2 decoding
fatal: sha1 information is lacking or useless (libavcodec/vc1dec.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 vc1: implement vc1 field interlaced dxva2 decoding

Do you have some public repository/branch  that contains all changes
that should be merged ?

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No human being will ever know the Truth, for even if they happen to say it
by chance, they would not even known they had done so. -- Xenophanes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20121015/eb862309/attachment.asc>