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
9ae762da
Commit
9ae762da
authored
Mar 01, 2017
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/matroska: Support codec ID V_FFV1 for demuxing.
Fixes ticket #6206.
parent
55196e5d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
matroska.c
libavformat/matroska.c
+1
-0
matroskaenc.c
libavformat/matroskaenc.c
+1
-1
No files found.
libavformat/matroska.c
View file @
9ae762da
...
...
@@ -77,6 +77,7 @@ const CodecTags ff_mkv_codec_tags[]={
{
"S_HDMV/TEXTST"
,
AV_CODEC_ID_HDMV_TEXT_SUBTITLE
},
{
"V_DIRAC"
,
AV_CODEC_ID_DIRAC
},
{
"V_FFV1"
,
AV_CODEC_ID_FFV1
},
{
"V_MJPEG"
,
AV_CODEC_ID_MJPEG
},
{
"V_MPEG1"
,
AV_CODEC_ID_MPEG1VIDEO
},
{
"V_MPEG2"
,
AV_CODEC_ID_MPEG2VIDEO
},
...
...
libavformat/matroskaenc.c
View file @
9ae762da
...
...
@@ -1138,7 +1138,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
// if none are found, use AVI codes
if
(
par
->
codec_id
!=
AV_CODEC_ID_RAWVIDEO
||
par
->
codec_tag
)
{
for
(
j
=
0
;
ff_mkv_codec_tags
[
j
].
id
!=
AV_CODEC_ID_NONE
;
j
++
)
{
if
(
ff_mkv_codec_tags
[
j
].
id
==
par
->
codec_id
)
{
if
(
ff_mkv_codec_tags
[
j
].
id
==
par
->
codec_id
&&
par
->
codec_id
!=
AV_CODEC_ID_FFV1
)
{
put_ebml_string
(
pb
,
MATROSKA_ID_CODECID
,
ff_mkv_codec_tags
[
j
].
str
);
native_id
=
1
;
break
;
...
...
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