Revision 87e4d9b2

View differences:

doc/ffmpeg.texi
628 628
@var{sync_stream_id} if specified sets the input stream to sync
629 629
against.
630 630
@item -map_meta_data @var{outfile}[,@var{metadata}]:@var{infile}[,@var{metadata}]
631
Set meta data information of @var{outfile} from @var{infile}. Note that those
631
Deprecated, use @var{-map_metadata} instead.
632

  
633
@item -map_metadata @var{outfile}[,@var{metadata}]:@var{infile}[,@var{metadata}]
634
Set metadata information of @var{outfile} from @var{infile}. Note that those
632 635
are file indices (zero-based), not filenames.
633 636
Optional @var{metadata} parameters specify, which metadata to copy - (g)lobal
634 637
(i.e. metadata that applies to the whole file), per-(s)tream, per-(c)hapter or
......
644 647
For example to copy metadata from the first stream of the input file to global metadata
645 648
of the output file:
646 649
@example
647
ffmpeg -i in.ogg -map_meta_data 0:0,s0 out.mp3
650
ffmpeg -i in.ogg -map_metadata 0:0,s0 out.mp3
648 651
@end example
649 652
@item -map_chapters @var{outfile}:@var{infile}
650 653
Copy chapters from @var{infile} to @var{outfile}. If no chapter mapping is specified,
ffmpeg.c
3013 3013
        *type = 'g';
3014 3014
}
3015 3015

  
3016
static void opt_map_meta_data(const char *arg)
3016
static void opt_map_metadata(const char *arg)
3017 3017
{
3018 3018
    AVMetaDataMap *m, *m1;
3019 3019
    char *p;
......
3039 3039
        metadata_chapters_autocopy = 0;
3040 3040
}
3041 3041

  
3042
static void opt_map_meta_data(const char *arg)
3043
{
3044
    fprintf(stderr, "-map_meta_data is deprecated and will be removed soon. "
3045
                    "Use -map_metadata instead.\n");
3046
    opt_map_metadata(arg);
3047
}
3048

  
3042 3049
static void opt_map_chapters(const char *arg)
3043 3050
{
3044 3051
    AVChapterMap *c;
......
4197 4204
    { "i", HAS_ARG, {(void*)opt_input_file}, "input file name", "filename" },
4198 4205
    { "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" },
4199 4206
    { "map", HAS_ARG | OPT_EXPERT, {(void*)opt_map}, "set input stream mapping", "file:stream[:syncfile:syncstream]" },
4200
    { "map_meta_data", HAS_ARG | OPT_EXPERT, {(void*)opt_map_meta_data}, "set meta data information of outfile from infile", "outfile[,metadata]:infile[,metadata]" },
4207
    { "map_meta_data", HAS_ARG | OPT_EXPERT, {(void*)opt_map_meta_data}, "DEPRECATED set meta data information of outfile from infile",
4208
      "outfile[,metadata]:infile[,metadata]" },
4209
    { "map_metadata", HAS_ARG | OPT_EXPERT, {(void*)opt_map_metadata}, "set metadata information of outfile from infile",
4210
      "outfile[,metadata]:infile[,metadata]" },
4201 4211
    { "map_chapters",  HAS_ARG | OPT_EXPERT, {(void*)opt_map_chapters},  "set chapters mapping", "outfile:infile" },
4202 4212
    { "t", OPT_FUNC2 | HAS_ARG, {(void*)opt_recording_time}, "record or transcode \"duration\" seconds of audio/video", "duration" },
4203 4213
    { "fs", HAS_ARG | OPT_INT64, {(void*)&limit_filesize}, "set the limit file size in bytes", "limit_size" }, //

Also available in: Unified diff