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
ee4ef139
Commit
ee4ef139
authored
Jul 28, 2013
by
Matthieu Bouron
Committed by
Michael Niedermayer
Jul 28, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/movenc: remove useless checks on AVOutputFormat
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
2186a7e5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
17 deletions
+15
-17
movenc.c
libavformat/movenc.c
+15
-17
No files found.
libavformat/movenc.c
View file @
ee4ef139
...
@@ -3538,7 +3538,7 @@ static int mov_write_header(AVFormatContext *s)
...
@@ -3538,7 +3538,7 @@ static int mov_write_header(AVFormatContext *s)
* is enabled, we don't support non-seekable output at all. */
* is enabled, we don't support non-seekable output at all. */
if
(
!
s
->
pb
->
seekable
&&
if
(
!
s
->
pb
->
seekable
&&
((
!
(
mov
->
flags
&
FF_MOV_FLAG_FRAGMENT
)
&&
((
!
(
mov
->
flags
&
FF_MOV_FLAG_FRAGMENT
)
&&
!
(
s
->
oformat
&&
!
strcmp
(
s
->
oformat
->
name
,
"ismv"
)
))
strcmp
(
s
->
oformat
->
name
,
"ismv"
))
||
mov
->
ism_lookahead
))
{
||
mov
->
ism_lookahead
))
{
av_log
(
s
,
AV_LOG_ERROR
,
"muxer does not support non seekable output
\n
"
);
av_log
(
s
,
AV_LOG_ERROR
,
"muxer does not support non seekable output
\n
"
);
return
-
1
;
return
-
1
;
...
@@ -3547,23 +3547,21 @@ static int mov_write_header(AVFormatContext *s)
...
@@ -3547,23 +3547,21 @@ static int mov_write_header(AVFormatContext *s)
/* Default mode == MP4 */
/* Default mode == MP4 */
mov
->
mode
=
MODE_MP4
;
mov
->
mode
=
MODE_MP4
;
if
(
s
->
oformat
!=
NULL
)
{
if
(
!
strcmp
(
"3gp"
,
s
->
oformat
->
name
))
mov
->
mode
=
MODE_3GP
;
if
(
!
strcmp
(
"3gp"
,
s
->
oformat
->
name
))
mov
->
mode
=
MODE_3GP
;
else
if
(
!
strcmp
(
"3g2"
,
s
->
oformat
->
name
))
mov
->
mode
=
MODE_3GP
|
MODE_3G2
;
else
if
(
!
strcmp
(
"3g2"
,
s
->
oformat
->
name
))
mov
->
mode
=
MODE_3GP
|
MODE_3G2
;
else
if
(
!
strcmp
(
"mov"
,
s
->
oformat
->
name
))
mov
->
mode
=
MODE_MOV
;
else
if
(
!
strcmp
(
"mov"
,
s
->
oformat
->
name
))
mov
->
mode
=
MODE_MOV
;
else
if
(
!
strcmp
(
"psp"
,
s
->
oformat
->
name
))
mov
->
mode
=
MODE_PSP
;
else
if
(
!
strcmp
(
"psp"
,
s
->
oformat
->
name
))
mov
->
mode
=
MODE_PSP
;
else
if
(
!
strcmp
(
"ipod"
,
s
->
oformat
->
name
))
mov
->
mode
=
MODE_IPOD
;
else
if
(
!
strcmp
(
"ipod"
,
s
->
oformat
->
name
))
mov
->
mode
=
MODE_IPOD
;
else
if
(
!
strcmp
(
"ismv"
,
s
->
oformat
->
name
))
mov
->
mode
=
MODE_ISM
;
else
if
(
!
strcmp
(
"ismv"
,
s
->
oformat
->
name
))
mov
->
mode
=
MODE_ISM
;
else
if
(
!
strcmp
(
"f4v"
,
s
->
oformat
->
name
))
mov
->
mode
=
MODE_F4V
;
else
if
(
!
strcmp
(
"f4v"
,
s
->
oformat
->
name
))
mov
->
mode
=
MODE_F4V
;
mov_write_ftyp_tag
(
pb
,
s
);
mov_write_ftyp_tag
(
pb
,
s
);
if
(
mov
->
mode
==
MODE_PSP
)
{
if
(
mov
->
mode
==
MODE_PSP
)
{
if
(
s
->
nb_streams
!=
2
)
{
if
(
s
->
nb_streams
!=
2
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"PSP mode need one video and one audio stream
\n
"
);
av_log
(
s
,
AV_LOG_ERROR
,
"PSP mode need one video and one audio stream
\n
"
);
return
-
1
;
return
-
1
;
}
mov_write_uuidprof_tag
(
pb
,
s
);
}
}
mov_write_uuidprof_tag
(
pb
,
s
);
}
}
mov
->
nb_streams
=
s
->
nb_streams
;
mov
->
nb_streams
=
s
->
nb_streams
;
...
...
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