diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-11-29 08:41:24 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-12-16 19:18:45 +0100 |
| commit | 9985710a5a927d52c345c4bdcc88f5c014ee2fe7 (patch) | |
| tree | 88c3bceb40426b5f0abfcd9dff02ac708cdf0585 /doc | |
| parent | 33f10fa6570679a0a90fc80e7dd5589d392c7d2c (diff) | |
| download | ffmpeg-9985710a5a927d52c345c4bdcc88f5c014ee2fe7.tar.gz | |
ffserver: add stream Metadata option
Also deprecate Author, Comment, Copyright, and Title options, and update
docs to use the new Metadata option.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffserver.conf | 10 | ||||
| -rw-r--r-- | doc/ffserver.texi | 16 |
2 files changed, 15 insertions, 11 deletions
diff --git a/doc/ffserver.conf b/doc/ffserver.conf index 0f5922cc3e..094c093af2 100644 --- a/doc/ffserver.conf +++ b/doc/ffserver.conf @@ -235,7 +235,7 @@ StartSendOnKey #<Stream test.ogg> #Feed feed1.ffm -#Title "Stream title" +#Metadata title "Stream title" #AudioBitRate 64 #AudioChannels 2 #AudioSampleRate 44100 @@ -280,10 +280,10 @@ StartSendOnKey #<Stream file.asf> #File "/usr/local/httpd/htdocs/test.asf" #NoAudio -#Author "Me" -#Copyright "Super MegaCorp" -#Title "Test stream from disk" -#Comment "Test comment" +#Metadata author "Me" +#Metadata copyright "Super MegaCorp" +#Metadata title "Test stream from disk" +#Metadata comment "Test comment" #</Stream> diff --git a/doc/ffserver.texi b/doc/ffserver.texi index 3f7a98dbe5..ed538c1af0 100644 --- a/doc/ffserver.texi +++ b/doc/ffserver.texi @@ -550,7 +550,11 @@ for regular streams. @item Comment @var{value} @item Copyright @var{value} @item Title @var{value} -Set metadata corresponding to the option. +Set metadata corresponding to the option. All these options are +deprecated in favor of @option{Metadata}. + +@item Metadata @var{key} @var{value} +Set metadata value on the output stream. @item NoAudio @item NoVideo @@ -757,7 +761,7 @@ Ogg Vorbis audio @example <Stream test.ogg> Feed feed1.ffm -Title "Stream title" +Metadata title "Stream title" AudioBitRate 64 AudioChannels 2 AudioSampleRate 44100 @@ -804,10 +808,10 @@ NoAudio <Stream file.asf> File "/usr/local/httpd/htdocs/test.asf" NoAudio -Author "Me" -Copyright "Super MegaCorp" -Title "Test stream from disk" -Comment "Test comment" +Metadata author "Me" +Metadata copyright "Super MegaCorp" +Metadata title "Test stream from disk" +Metadata comment "Test comment" </Stream> @end example @end itemize |