Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
bcb82fe1
Commit
bcb82fe1
authored
Apr 05, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avconv: use libavresample
parent
c8af852b
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
68 additions
and
72 deletions
+68
-72
avconv.c
avconv.c
+64
-71
cmdutils.c
cmdutils.c
+4
-1
No files found.
avconv.c
View file @
bcb82fe1
This diff is collapsed.
Click to expand it.
cmdutils.c
View file @
bcb82fe1
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
#include "libavformat/avformat.h"
#include "libavformat/avformat.h"
#include "libavfilter/avfilter.h"
#include "libavfilter/avfilter.h"
#include "libavdevice/avdevice.h"
#include "libavdevice/avdevice.h"
#include "libavresample/avresample.h"
#include "libswscale/swscale.h"
#include "libswscale/swscale.h"
#include "libavutil/avstring.h"
#include "libavutil/avstring.h"
#include "libavutil/mathematics.h"
#include "libavutil/mathematics.h"
...
@@ -460,7 +461,8 @@ static int warned_cfg = 0;
...
@@ -460,7 +461,8 @@ static int warned_cfg = 0;
const char *indent = flags & INDENT? " " : ""; \
const char *indent = flags & INDENT? " " : ""; \
if (flags & SHOW_VERSION) { \
if (flags & SHOW_VERSION) { \
unsigned int version = libname##_version(); \
unsigned int version = libname##_version(); \
av_log(NULL, level, "%slib%-9s %2d.%3d.%2d / %2d.%3d.%2d\n",\
av_log(NULL, level, \
"%slib%-10s %2d.%3d.%2d / %2d.%3d.%2d\n", \
indent, #libname, \
indent, #libname, \
LIB##LIBNAME##_VERSION_MAJOR, \
LIB##LIBNAME##_VERSION_MAJOR, \
LIB##LIBNAME##_VERSION_MINOR, \
LIB##LIBNAME##_VERSION_MINOR, \
...
@@ -489,6 +491,7 @@ static void print_all_libs_info(int flags, int level)
...
@@ -489,6 +491,7 @@ static void print_all_libs_info(int flags, int level)
PRINT_LIB_INFO
(
avformat
,
AVFORMAT
,
flags
,
level
);
PRINT_LIB_INFO
(
avformat
,
AVFORMAT
,
flags
,
level
);
PRINT_LIB_INFO
(
avdevice
,
AVDEVICE
,
flags
,
level
);
PRINT_LIB_INFO
(
avdevice
,
AVDEVICE
,
flags
,
level
);
PRINT_LIB_INFO
(
avfilter
,
AVFILTER
,
flags
,
level
);
PRINT_LIB_INFO
(
avfilter
,
AVFILTER
,
flags
,
level
);
PRINT_LIB_INFO
(
avresample
,
AVRESAMPLE
,
flags
,
level
);
PRINT_LIB_INFO
(
swscale
,
SWSCALE
,
flags
,
level
);
PRINT_LIB_INFO
(
swscale
,
SWSCALE
,
flags
,
level
);
}
}
...
...
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