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

[Michael Niedermayer]

On Fri, Oct 19, 2012 at 10:32:44PM +0200, Hendrik Leppkes wrote:
> On Mon, Oct 15, 2012 at 9:19 PM, Michael Niedermayer <michaelni at gmx.at> wrote:
> > 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 ?
> >
> 
> Not readily available, but attached are the two patches, rebased against master.

both patches applied

thanks

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Asymptotically faster algorithms should always be preferred if you have
asymptotical amounts of data
-------------- 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/20121020/c479ca0e/attachment.asc>