[FFmpeg-soc] [soc]: r1175 - matroska/mkv-muxer.diff

[Aurelien Jacobs]

On Thu, 30 Aug 2007 10:43:50 +0200
Diego Biurrun <diego at biurrun.de> wrote:

> On Wed, Aug 29, 2007 at 11:37:09PM -0400, David Conrad wrote:
> > On Aug 24, 2007, at 4:56 AM, Diego Biurrun wrote:
> > 
> > > On Fri, Aug 24, 2007 at 03:17:02AM +0200, conrad wrote:
> > >>
> > >> Log:
> > >> Add changelog and documentation entries
> > >>
> > >> --- matroska/mkv-muxer.diff	(original)
> > >> +++ matroska/mkv-muxer.diff	Fri Aug 24 03:17:02 2007
> > >> @@ -13,12 +38,12 @@ index 794d212..7bbd0e2 100644
> > >>  --- a/libavformat/allformats.c
> > >>  +++ b/libavformat/allformats.c
> > >>  @@ -91,7 +91,8 @@ void av_register_all(void)
> > >>       if (!ENABLE_NUT_DEMUXER) REGISTER_DEMUXER (LIBNUT, libnut);
> > >> -     REGISTER_MUXER   (LIBNUT, libnut);
> > >> +     if (!ENABLE_NUT_MUXER)   REGISTER_MUXER   (LIBNUT, libnut);
> > >
> > > stray hunk
> > 
> > It looks like this was due to my updating ffmpeg as well; I didn't  
> > notice this but I guess the previous diff was made with pre- r10102  
> > ffmpeg. I've changed the log message to reflect this, and I'll pay  
> > more attention in the future.
> 
> The point is not changing the log message, you need to update your patch
> ;)

I think not. I think this commit was ok (besides the commit message).
Notice that this hunk is modifying a diff file (and more specifically
a context line which has changed in ffmpeg svn).

Aurel