diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 18:53:58 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 19:22:52 +0300 |
| commit | 0fecf2642b9d909820683647c70031a954f5e58d (patch) | |
| tree | 36ca02de9fa27a049829fb589517223d2d0ce5f5 /doc/metadata.texi | |
| parent | e309fdc7018a1027d187ec27fb1d69a41a4ee167 (diff) | |
| parent | f1f60f5252b0b448adcce0c1c52f3161ee69b9bf (diff) | |
Merge remote-tracking branch 'newdev/master'
Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/metadata.texi')
| -rw-r--r-- | doc/metadata.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/metadata.texi b/doc/metadata.texi index 2a285757cc..cfaf491c2d 100644 --- a/doc/metadata.texi +++ b/doc/metadata.texi @@ -1,7 +1,7 @@ @chapter Metadata @c man begin METADATA -FFmpeg is able to dump metadata from media files into a simple UTF-8-encoded +Libav is able to dump metadata from media files into a simple UTF-8-encoded INI-like text file and then load it back using the metadata muxer/demuxer. The file format is as follows: @@ -53,7 +53,7 @@ A ffmetadata file might look like this: ;FFMETADATA1 title=bike\\shed ;this is a comment -artist=FFmpeg troll team +artist=Libav troll team [CHAPTER] TIMEBASE=1/1000 |