Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
91e8d2eb
Commit
91e8d2eb
authored
Jul 05, 2014
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: use the format context strict_std_compliance instead of the codec one
parent
2f3fadfb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
movenc.c
libavformat/movenc.c
+1
-1
mux.c
libavformat/mux.c
+1
-1
No files found.
libavformat/movenc.c
View file @
91e8d2eb
...
...
@@ -881,7 +881,7 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track)
{
int
tag
=
track
->
enc
->
codec_tag
;
if
(
!
tag
||
(
track
->
enc
->
strict_std_compliance
>=
FF_COMPLIANCE_NORMAL
&&
if
(
!
tag
||
(
s
->
strict_std_compliance
>=
FF_COMPLIANCE_NORMAL
&&
(
track
->
enc
->
codec_id
==
AV_CODEC_ID_DVVIDEO
||
track
->
enc
->
codec_id
==
AV_CODEC_ID_RAWVIDEO
||
track
->
enc
->
codec_id
==
AV_CODEC_ID_H263
||
...
...
libavformat/mux.c
View file @
91e8d2eb
...
...
@@ -79,7 +79,7 @@ static int validate_codec_tag(AVFormatContext *s, AVStream *st)
}
if
(
id
!=
AV_CODEC_ID_NONE
)
return
0
;
if
(
tag
&&
(
s
t
->
codec
->
strict_std_compliance
>=
FF_COMPLIANCE_NORMAL
))
if
(
tag
&&
(
s
->
strict_std_compliance
>=
FF_COMPLIANCE_NORMAL
))
return
0
;
return
1
;
}
...
...
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