[FFmpeg-devel] [PATCH 1/4] ffmpeg: remove unused meta_data_maps.

[Clément Bœsch]

On Sat, Mar 24, 2012 at 11:41:31AM +0100, Stefano Sabatini wrote:
> On date Thursday 2012-03-22 16:50:38 +0100, Clément Bœsch encoded:
> > From: Clément Bœsch <clement.boesch at smartjog.com>
> > 
> > This is unused since a7b5e841ffe4b0f8423288965b8d069bd2a7a792.
> > ---
> >  ffmpeg.c |    4 ----
> >  1 files changed, 0 insertions(+), 4 deletions(-)
> > 
> > diff --git a/ffmpeg.c b/ffmpeg.c
> > index 2a64182..5606f17 100644
> > --- a/ffmpeg.c
> > +++ b/ffmpeg.c
> > @@ -360,9 +360,6 @@ typedef struct OptionsContext {
> >      int     nb_stream_maps;
> >      AudioChannelMap *audio_channel_maps; ///< one info entry per -map_channel
> >      int           nb_audio_channel_maps; ///< number of (valid) -map_channel settings
> > -    /* first item specifies output metadata, second is input */
> > -    MetadataMap (*meta_data_maps)[2];
> > -    int nb_meta_data_maps;
> >      int metadata_global_manual;
> >      int metadata_streams_manual;
> >      int metadata_chapters_manual;
> > @@ -461,7 +458,6 @@ static void reset_options(OptionsContext *o, int is_input)
> >  
> >      av_freep(&o->stream_maps);
> >      av_freep(&o->audio_channel_maps);
> > -    av_freep(&o->meta_data_maps);
> >      av_freep(&o->streamid_map);
> >  
> >      memset(o, 0, sizeof(*o));
> 
> After checking the source, I confirm it is not used anymore indeed, so
> looks fine.

Pushed.

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120406/a415f261/attachment.asc>