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
050dc127
Commit
050dc127
authored
13 years ago
by
Reinhard Tartler
Browse files
Options
Downloads
Patches
Plain Diff
Read preset files with suffix .avpreset
The preset files have been renamed some time ago. CC: libav-stable@libav.org
parent
6acac061
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.c
+2
-2
2 additions, 2 deletions
cmdutils.c
cmdutils.h
+2
-2
2 additions, 2 deletions
cmdutils.h
with
4 additions
and
4 deletions
cmdutils.c
+
2
−
2
View file @
050dc127
...
...
@@ -872,12 +872,12 @@ FILE *get_preset_file(char *filename, size_t filename_size,
for
(
i
=
0
;
i
<
3
&&
!
f
;
i
++
)
{
if
(
!
base
[
i
])
continue
;
snprintf
(
filename
,
filename_size
,
"%s%s/%s.
ff
preset"
,
base
[
i
],
snprintf
(
filename
,
filename_size
,
"%s%s/%s.
av
preset"
,
base
[
i
],
i
!=
1
?
""
:
"/.avconv"
,
preset_name
);
f
=
fopen
(
filename
,
"r"
);
if
(
!
f
&&
codec_name
)
{
snprintf
(
filename
,
filename_size
,
"%s%s/%s-%s.
ff
preset"
,
"%s%s/%s-%s.
av
preset"
,
base
[
i
],
i
!=
1
?
""
:
"/.avconv"
,
codec_name
,
preset_name
);
f
=
fopen
(
filename
,
"r"
);
...
...
This diff is collapsed.
Click to expand it.
cmdutils.h
+
2
−
2
View file @
050dc127
...
...
@@ -351,11 +351,11 @@ int64_t guess_correct_pts(PtsCorrectionContext *ctx, int64_t pts, int64_t dts);
* Get a file corresponding to a preset file.
*
* If is_path is non-zero, look for the file in the path preset_name.
* Otherwise search for a file named arg.
ff
preset in the directories
* Otherwise search for a file named arg.
av
preset in the directories
* $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.
ff
preset in the above-mentioned directories.
* codec_name-preset_name.
av
preset in the above-mentioned directories.
*
* @param filename buffer where the name of the found filename is written
* @param filename_size size in bytes of the filename buffer
...
...
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