Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
959bea13
Commit
959bea13
authored
Oct 03, 2013
by
Yusuke Nakamura
Committed by
Anton Khirnov
Oct 31, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
matroskadec: Support HEVC demuxing
parent
ea29f965
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
4 deletions
+6
-4
Changelog
Changelog
+1
-1
matroska.c
libavformat/matroska.c
+1
-0
matroskadec.c
libavformat/matroskadec.c
+3
-2
version.h
libavformat/version.h
+1
-1
No files found.
Changelog
View file @
959bea13
...
...
@@ -42,7 +42,7 @@ version 10:
- F4V muxer
- HNM version 4 demuxer and video decoder
- HEVC decoder
- raw HEVC, HEVC in MOV/MP4 demuxing
- raw HEVC, HEVC in MOV/MP4
, HEVC in Matroska
demuxing
version 9:
...
...
libavformat/matroska.c
View file @
959bea13
...
...
@@ -70,6 +70,7 @@ const CodecTags ff_mkv_codec_tags[]={
{
"V_MPEG4/ISO/AP"
,
AV_CODEC_ID_MPEG4
},
{
"V_MPEG4/ISO/SP"
,
AV_CODEC_ID_MPEG4
},
{
"V_MPEG4/ISO/AVC"
,
AV_CODEC_ID_H264
},
{
"V_MPEGH/ISO/HEVC"
,
AV_CODEC_ID_HEVC
},
{
"V_MPEG4/MS/V3"
,
AV_CODEC_ID_MSMPEG4V3
},
{
"V_PRORES"
,
AV_CODEC_ID_PRORES
},
{
"V_REAL/RV10"
,
AV_CODEC_ID_RV10
},
...
...
libavformat/matroskadec.c
View file @
959bea13
...
...
@@ -1693,8 +1693,9 @@ static int matroska_read_header(AVFormatContext *s)
st
->
codec
->
height
*
track
->
video
.
display_width
,
st
->
codec
->
width
*
track
->
video
.
display_height
,
255
);
if
(
st
->
codec
->
codec_id
!=
AV_CODEC_ID_H264
)
st
->
need_parsing
=
AVSTREAM_PARSE_HEADERS
;
if
(
st
->
codec
->
codec_id
!=
AV_CODEC_ID_H264
&&
st
->
codec
->
codec_id
!=
AV_CODEC_ID_HEVC
)
st
->
need_parsing
=
AVSTREAM_PARSE_HEADERS
;
if
(
track
->
default_duration
)
{
av_reduce
(
&
st
->
avg_frame_rate
.
num
,
&
st
->
avg_frame_rate
.
den
,
1000000000
,
track
->
default_duration
,
30000
);
...
...
libavformat/version.h
View file @
959bea13
...
...
@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 55
#define LIBAVFORMAT_VERSION_MINOR 9
#define LIBAVFORMAT_VERSION_MICRO
1
#define LIBAVFORMAT_VERSION_MICRO
2
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
...
...
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