[vlc-devel] [PATCH] dash: Added Buffer and Downloader

[Frederic YHUEL]

2012/1/30 Christopher Müller <christopher.mueller at itec.uni-klu.ac.at>:
> Hi,
>
>
>
> These patches will add a block based buffer and a download thread to dash. I
> haven’t encountered any errors until my “short” tests today but I have left
> the debug couts in the code.  I will now be on vacation (have to learn for
> an exam :D) until Friday so if you encounter any bugs just report them I
> will fix them on Friday or on the weekend.
>
>

Cool!

Unfortunately, I could not apply them. I guess I need to apply
previous patches, but the error message is suspicious:

fred at yhuelf-OptiPlex-790:~/vlc/chris_patches$ git am -3 *
Applying: dash: added blockbuffer
Applying: dash: added downloader
Applying: dash: added bitrate to chunk
fatal: sha1 information is lacking or useless
(modules/stream_filter/dash/http/Chunk.cpp).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0003 dash: added bitrate to chunk

Is there a git ninja around here?

Good luck for your exam!

-- 
Frédéric