Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
25c27f37
Commit
25c27f37
authored
Sep 29, 2011
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
doc: fix references to obsolete presets directories for avconv/ffmpeg
parent
4b7f4908
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
cmdutils.h
cmdutils.h
+1
-1
ffmpeg.texi
doc/ffmpeg.texi
+2
-2
No files found.
cmdutils.h
View file @
25c27f37
...
@@ -334,7 +334,7 @@ int64_t guess_correct_pts(PtsCorrectionContext *ctx, int64_t pts, int64_t dts);
...
@@ -334,7 +334,7 @@ int64_t guess_correct_pts(PtsCorrectionContext *ctx, int64_t pts, int64_t dts);
*
*
* If is_path is non-zero, look for the file in the path preset_name.
* If is_path is non-zero, look for the file in the path preset_name.
* Otherwise search for a file named arg.ffpreset in the directories
* Otherwise search for a file named arg.ffpreset in the directories
* $
FFMPEG_DATADIR (if set), $HOME/.ffmpeg
, and in the datadir defined
* $
AVCONV_DATADIR (if set), $HOME/.avconv
, and in the datadir defined
* at configuration time, in that order. If no such file is found and
* at configuration time, in that order. If no such file is found and
* codec_name is defined, then search for a file named
* codec_name is defined, then search for a file named
* codec_name-preset_name.ffpreset in the above-mentioned directories.
* codec_name-preset_name.ffpreset in the above-mentioned directories.
...
...
doc/ffmpeg.texi
View file @
25c27f37
...
@@ -806,8 +806,8 @@ preset options identifies the preset file to use according to the
...
@@ -806,8 +806,8 @@ preset options identifies the preset file to use according to the
following rules:
following rules:
First ffmpeg searches for a file named @var
{
arg
}
.ffpreset in the
First ffmpeg searches for a file named @var
{
arg
}
.ffpreset in the
directories @file
{$
FFMPEG
_
DATADIR
}
(
if set
)
, and @file
{$
HOME/.ffmpeg
}
, and in
directories @file
{$
AVCONV
_
DATADIR
}
(
if set
)
, and @file
{$
HOME/.avconv
}
, and in
the datadir defined at configuration time (usually @file
{
PREFIX/share/
ffmpeg
}
)
the datadir defined at configuration time (usually @file
{
PREFIX/share/
avconv
}
)
in that order. For example, if the argument is @code
{
libx264-max
}
, it will
in that order. For example, if the argument is @code
{
libx264-max
}
, it will
search for the file @file
{
libx264-max.ffpreset
}
.
search for the file @file
{
libx264-max.ffpreset
}
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment