[FFmpeg-devel] [PATCH] fix raw FLAC muxer extradata handling

[Aurelien Jacobs]

Justin Ruggles wrote:

> Aurelien Jacobs wrote:
> > On Sat, 21 Feb 2009 21:25:45 -0500
> > Justin Ruggles <justin.ruggles at gmail.com> wrote:
> > 
> >> Michael Niedermayer wrote:
> >>> On Sat, Feb 21, 2009 at 04:27:54PM -0500, Justin Ruggles wrote:
> >>> [...]
> >>>> --- a/libavformat/raw.c
> >>>> +++ b/libavformat/raw.c
> >>>> @@ -31,12 +31,11 @@
> >>>>  
> >>>>  /* simple formats */
> >>>>  #if CONFIG_FLAC_MUXER
> >>>> -static int flac_write_header(struct AVFormatContext *s)
> >>>> +int ff_flac_write_header(ByteIOContext *pb, AVCodecContext *codec)
> >>>>  {
> >>> i doubt a little that this belongs on raw.c/h
> >> True, it would definitely make dependencies simpler if it were split it
> >> into a separate file.  How about libavformat/flac.[ch]?
> > 
> > Sounds good. Or you may also consider moving the whole flac muxer into
> > a flacenc.c file.
> 
> [PATCH 1/6] Separate the raw FLAC muxer into its own file.
> [PATCH 2/6] Use a shared function to validate FLAC extradata
> [PATCH 3/6] cosmetics: line wrap and indentation
> [PATCH 4/6] Add support for full header extradata to raw FLAC muxer
> [PATCH 5/6] cosmetics: add a comment in flac_write_header().
> [PATCH 6/6] Share the function to write a raw FLAC header and use in the
> Matroska muxer.
> 
> I have not attached patches 3, 4, and 5 since they have been approved
> already.  Patches 4 and 5 are against libavformat/flacenc.c instead of
> raw.c, but they are the same otherwise.

Everything regarding matroska is OK.

> In patch 1, I decided to split out the whole FLAC muxer into a new file.

Nice :-)

>  The patch doesn't reflect the fact that I would use
> "svn copy"...I couldn't figure out how to get git to show that.

Have a look at the -C and --find-copies-harder options of git diff.
They might be what you are looking for.

Aurel