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
fb42d156
Commit
fb42d156
authored
Aug 20, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
movenc: use libx264 by default when possible for mov, mp4 and psp
parent
b71389cb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
movenc.c
libavformat/movenc.c
+12
-0
lavf-regression.sh
tests/lavf-regression.sh
+1
-1
No files found.
libavformat/movenc.c
View file @
fb42d156
...
...
@@ -2343,7 +2343,11 @@ AVOutputFormat ff_mov_muxer = {
.
extensions
=
"mov"
,
.
priv_data_size
=
sizeof
(
MOVMuxContext
),
.
audio_codec
=
CODEC_ID_AAC
,
#if CONFIG_LIBX264_ENCODER
.
video_codec
=
CODEC_ID_H264
,
#else
.
video_codec
=
CODEC_ID_MPEG4
,
#endif
.
write_header
=
mov_write_header
,
.
write_packet
=
ff_mov_write_packet
,
.
write_trailer
=
mov_write_trailer
,
...
...
@@ -2376,7 +2380,11 @@ AVOutputFormat ff_mp4_muxer = {
.
extensions
=
"mp4"
,
.
priv_data_size
=
sizeof
(
MOVMuxContext
),
.
audio_codec
=
CODEC_ID_AAC
,
#if CONFIG_LIBX264_ENCODER
.
video_codec
=
CODEC_ID_H264
,
#else
.
video_codec
=
CODEC_ID_MPEG4
,
#endif
.
write_header
=
mov_write_header
,
.
write_packet
=
ff_mov_write_packet
,
.
write_trailer
=
mov_write_trailer
,
...
...
@@ -2392,7 +2400,11 @@ AVOutputFormat ff_psp_muxer = {
.
extensions
=
"mp4,psp"
,
.
priv_data_size
=
sizeof
(
MOVMuxContext
),
.
audio_codec
=
CODEC_ID_AAC
,
#if CONFIG_LIBX264_ENCODER
.
video_codec
=
CODEC_ID_H264
,
#else
.
video_codec
=
CODEC_ID_MPEG4
,
#endif
.
write_header
=
mov_write_header
,
.
write_packet
=
ff_mov_write_packet
,
.
write_trailer
=
mov_write_trailer
,
...
...
tests/lavf-regression.sh
View file @
fb42d156
...
...
@@ -87,7 +87,7 @@ do_lavf flv -an
fi
if
[
-n
"
$do_mov
"
]
;
then
do_lavf mov
"-acodec pcm_alaw"
do_lavf mov
"-acodec pcm_alaw
-c:v mpeg4
"
fi
if
[
-n
"
$do_dv_fmt
"
]
;
then
...
...
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