Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
25c27f37
Commit
25c27f37
authored
13 years ago
by
Diego Biurrun
Browse files
Options
Downloads
Patches
Plain Diff
doc: fix references to obsolete presets directories for avconv/ffmpeg
parent
4b7f4908
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmdutils.h
+1
-1
1 addition, 1 deletion
cmdutils.h
doc/ffmpeg.texi
+2
-2
2 additions, 2 deletions
doc/ffmpeg.texi
with
3 additions
and
3 deletions
cmdutils.h
+
1
−
1
View file @
25c27f37
...
...
@@ -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.
* 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
* codec_name is defined, then search for a file named
* codec_name-preset_name.ffpreset in the above-mentioned directories.
...
...
This diff is collapsed.
Click to expand it.
doc/ffmpeg.texi
+
2
−
2
View file @
25c27f37
...
...
@@ -806,8 +806,8 @@ preset options identifies the preset file to use according to the
following rules:
First ffmpeg searches for a file named @var
{
arg
}
.ffpreset in the
directories @file
{$
FFMPEG
_
DATADIR
}
(
if set
)
, and @file
{$
HOME/.
ffmpeg
}
, and in
the datadir defined at configuration time (usually @file
{
PREFIX/share/
ffmpeg
}
)
directories @file
{$
AVCONV
_
DATADIR
}
(
if set
)
, and @file
{$
HOME/.
avconv
}
, and in
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
search for the file @file
{
libx264-max.ffpreset
}
.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment