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
25fcbf7a
Commit
25fcbf7a
authored
Nov 02, 2016
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hevc: Support extradata changes
Signed-off-by:
Vittorio Giovara
<
vittorio.giovara@gmail.com
>
parent
46fae40d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
hevc.c
libavcodec/hevc.c
+10
-0
version.h
libavcodec/version.h
+1
-1
mov.c
libavformat/mov.c
+0
-4
No files found.
libavcodec/hevc.c
View file @
25fcbf7a
...
...
@@ -3049,6 +3049,8 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output,
AVPacket
*
avpkt
)
{
int
ret
;
int
new_extradata_size
;
uint8_t
*
new_extradata
;
HEVCContext
*
s
=
avctx
->
priv_data
;
if
(
!
avpkt
->
size
)
{
...
...
@@ -3060,6 +3062,14 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output,
return
0
;
}
new_extradata
=
av_packet_get_side_data
(
avpkt
,
AV_PKT_DATA_NEW_EXTRADATA
,
&
new_extradata_size
);
if
(
new_extradata
&&
new_extradata_size
>
0
)
{
ret
=
hevc_decode_extradata
(
s
,
new_extradata
,
new_extradata_size
);
if
(
ret
<
0
)
return
ret
;
}
s
->
ref
=
NULL
;
ret
=
decode_nal_units
(
s
,
avpkt
->
data
,
avpkt
->
size
);
if
(
ret
<
0
)
...
...
libavcodec/version.h
View file @
25fcbf7a
...
...
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 66
#define LIBAVCODEC_VERSION_MICRO 10
8
#define LIBAVCODEC_VERSION_MICRO 10
9
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
libavformat/mov.c
View file @
25fcbf7a
...
...
@@ -2232,10 +2232,6 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb,
avio_skip
(
pb
,
size
);
return
1
;
}
if
(
codec_tag
==
AV_RL32
(
"hvc1"
)
||
codec_tag
==
AV_RL32
(
"hev1"
)
)
av_log
(
c
->
fc
,
AV_LOG_WARNING
,
"Concatenated H.264 or H.265 might not play correctly.
\n
"
);
return
0
;
}
...
...
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