diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-17 23:57:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-17 23:59:00 +0200 |
| commit | 2d2b5a1421ee652f76a756024d0210f0b6455fda (patch) | |
| tree | d3fb60a796db87c4217167fd160cd14eae6ee98e /doc | |
| parent | c40798441f47341c310b38e8f329cfb943924faf (diff) | |
10l, commit that should have been stashed into the merge.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/issue_tracker.txt | 4 | ||||
| -rw-r--r-- | doc/muxers.texi | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/issue_tracker.txt b/doc/issue_tracker.txt index c7f8dbc1b3..e5a74db001 100644 --- a/doc/issue_tracker.txt +++ b/doc/issue_tracker.txt @@ -15,7 +15,7 @@ be properly added to the respective issue. The subscription URL for the ffmpeg-issues list is: http://live.polito/mailman/listinfo/ffmpeg-issues The URL of the webinterface of the tracker is: -http(s)://roundup.libav.org/ +http(s)://roundup.ffmpeg/roundup/ffmpeg/ Note the URLs in this document are obfuscated, you must append the top level domain for non-profit organizations to the tracker, and of Italy to the mailing list. @@ -187,7 +187,7 @@ feature_request/closed/wont_implement be legal, philosophical or others. Note, please do not use type-status-substatus combinations other than the -above without asking on libav-devel first! +above without asking on ffmpeg-dev first! Note2, if you provide the requested info do not forget to remove the needs_more_info substate. diff --git a/doc/muxers.texi b/doc/muxers.texi index 764d671c66..9d46803988 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -173,7 +173,7 @@ Set the first PID for data packets (default 0x0100, max 0x0f00). The recognized metadata settings in mpegts muxer are @code{service_provider} and @code{service_name}. If they are not set the default for -@code{service_provider} is "Libav" and the default for +@code{service_provider} is "FFmpeg" and the default for @code{service_name} is "Service01". @example |