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

[David Conrad]

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.