[FFmpeg-devel] [PATCH 1/9] Allow reading of growing avi files (ie currently being written)
michaelni at gmx.at
Sat Sep 10 21:29:27 CEST 2011
On Sat, Sep 10, 2011 at 09:20:30PM +0200, Michael Niedermayer wrote:
> On Sat, Sep 10, 2011 at 07:22:44PM +0200, Joakim Plate wrote:
> > This uses the RIFF header stored size to figure out the expected AVI
> > file size, instead
> > of the actual file. To work fully it requires handling failed
> > avio_seek() instead
> > of assuming they always succeed.
> > ---
> > libavformat/avidec.c | 8 ++++----
> > 1 files changed, 4 insertions(+), 4 deletions(-)
> sadly doesnt apply
> Applying: Allow reading of growing avi files (ie currently being written)
> /home/michael/ffmpeg-git3/ffmpeg/.git/rebase-apply/patch:14: trailing whitespace.
> int64_t filesize= avi->fsize;
> /home/michael/ffmpeg-git3/ffmpeg/.git/rebase-apply/patch:23: trailing whitespace.
> if(avi->fsize<=0 || avi->fsize < avi->riff_end)
> /home/michael/ffmpeg-git3/ffmpeg/.git/rebase-apply/patch:32: trailing whitespace.
> else avi->movi_end = avi->fsize;
> /home/michael/ffmpeg-git3/ffmpeg/.git/rebase-apply/patch:41: trailing whitespace.
> avi->movi_end = avi->fsize;
> error: patch failed: libavformat/avidec.c:157
> error: libavformat/avidec.c: patch does not apply
I succeeded to apply it with good old patch -p1
in the future, please use git format-patch to generate patches or
just put them in a public git branch and tell me merge them from there
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
When the tyrant has disposed of foreign enemies by conquest or treaty, and
there is nothing more to fear from them, then he is always stirring up
some war or other, in order that the people may require a leader. -- Plato
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 198 bytes
Desc: Digital signature
More information about the ffmpeg-devel