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
804ea14b
Commit
804ea14b
authored
Dec 23, 2013
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/nut: add minor_version field with version>=4
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
6aa50374
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
0 deletions
+5
-0
nut.h
libavformat/nut.h
+1
-0
nutdec.c
libavformat/nutdec.c
+2
-0
nutenc.c
libavformat/nutenc.c
+2
-0
No files found.
libavformat/nut.h
View file @
804ea14b
...
...
@@ -105,6 +105,7 @@ typedef struct NUTContext {
int64_t
max_pts
;
AVRational
*
max_pts_tb
;
int
version
;
int
minor_version
;
}
NUTContext
;
extern
const
AVCodecTag
ff_nut_subtitle_tags
[];
...
...
libavformat/nutdec.c
View file @
804ea14b
...
...
@@ -233,6 +233,8 @@ static int decode_main_header(NUTContext *nut)
return
AVERROR
(
ENOSYS
);
}
nut
->
version
=
tmp
;
if
(
nut
->
version
>
3
)
nut
->
minor_version
=
ffio_read_varlen
(
bc
);
GET_V
(
stream_count
,
tmp
>
0
&&
tmp
<=
NUT_MAX_STREAMS
);
...
...
libavformat/nutenc.c
View file @
804ea14b
...
...
@@ -338,6 +338,8 @@ static void write_mainheader(NUTContext *nut, AVIOContext *bc)
int64_t
tmp_match
;
ff_put_v
(
bc
,
nut
->
version
=
NUT_VERSION
);
if
(
nut
->
version
>
3
)
ff_put_v
(
bc
,
nut
->
minor_version
);
ff_put_v
(
bc
,
nut
->
avf
->
nb_streams
);
ff_put_v
(
bc
,
nut
->
max_distance
);
ff_put_v
(
bc
,
nut
->
time_base_count
);
...
...
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