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

[Hendrik Leppkes]

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.

- Hendrik
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-vc1-implement-vc1-field-interlaced-dxva2-decoding.patch
Type: application/octet-stream
Size: 5923 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20121019/61daa938/attachment.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-vc1-only-disable-interlaced-b-frames-for-software-de.patch
Type: application/octet-stream
Size: 1326 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20121019/61daa938/attachment-0001.obj>