[FFmpeg-devel] [PATCH] Add ff_ prefix to everything in riff.h

[Diego Biurrun]

On Mon, Jun 22, 2009 at 12:48:22PM -0400, Daniel Verkamp wrote:
> On Mon, Jun 22, 2009 at 5:56 AM, Diego Biurrun<diego at biurrun.de> wrote:
> > On Thu, Jun 18, 2009 at 07:08:49PM -0400, Daniel Verkamp wrote:
> >>
> >> The attached patch adds ff_ prefixes to everything in
> >> libavformat/riff.h (cleanup only, no functionality change).
> >
> > patching file libavformat/avienc.c
> > Hunk #2 succeeded at 204 with fuzz 2 (offset 4 lines).
> > Hunk #3 FAILED at 251.
> > Hunk #4 succeeded at 289 (offset 13 lines).
> > Hunk #5 succeeded at 300 (offset 13 lines).
> > Hunk #6 succeeded at 332 (offset 13 lines).
> > Hunk #7 succeeded at 362 (offset 13 lines).
> > Hunk #8 succeeded at 448 (offset 13 lines).
> > Hunk #9 succeeded at 473 (offset 13 lines).
> > Hunk #10 succeeded at 508 (offset 13 lines).
> > Hunk #11 succeeded at 564 (offset 13 lines).
> > Hunk #12 succeeded at 617 (offset 13 lines).
> > 1 out of 12 hunks FAILED -- saving rejects to file
> > libavformat/avienc.c.rej
> >
> > Please resend.
> 
> Automatic 3-way merge took care of it; rebased on master now.

Thanks, applied.

Diego