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
53dd3149
Commit
53dd3149
authored
Mar 11, 2024
by
James Almer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/matroska: use named constants for ITU-T T.35 metadata
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
61519cc6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
matroskadec.c
libavformat/matroskadec.c
+3
-1
matroskaenc.c
libavformat/matroskaenc.c
+3
-2
No files found.
libavformat/matroskadec.c
View file @
53dd3149
...
@@ -54,6 +54,7 @@
...
@@ -54,6 +54,7 @@
#include "libavcodec/bytestream.h"
#include "libavcodec/bytestream.h"
#include "libavcodec/defs.h"
#include "libavcodec/defs.h"
#include "libavcodec/flac.h"
#include "libavcodec/flac.h"
#include "libavcodec/itut35.h"
#include "libavcodec/mpeg4audio.h"
#include "libavcodec/mpeg4audio.h"
#include "libavcodec/packet_internal.h"
#include "libavcodec/packet_internal.h"
...
@@ -3884,7 +3885,8 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska,
...
@@ -3884,7 +3885,8 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska,
country_code
=
bytestream2_get_byteu
(
&
bc
);
country_code
=
bytestream2_get_byteu
(
&
bc
);
provider_code
=
bytestream2_get_be16u
(
&
bc
);
provider_code
=
bytestream2_get_be16u
(
&
bc
);
if
(
country_code
!=
0xB5
||
provider_code
!=
0x3C
)
if
(
country_code
!=
ITU_T_T35_COUNTRY_CODE_US
||
provider_code
!=
ITU_T_T35_PROVIDER_CODE_SMTPE
)
break
;
// ignore
break
;
// ignore
provider_oriented_code
=
bytestream2_get_be16u
(
&
bc
);
provider_oriented_code
=
bytestream2_get_be16u
(
&
bc
);
...
...
libavformat/matroskaenc.c
View file @
53dd3149
...
@@ -63,6 +63,7 @@
...
@@ -63,6 +63,7 @@
#include "libavcodec/codec_desc.h"
#include "libavcodec/codec_desc.h"
#include "libavcodec/codec_par.h"
#include "libavcodec/codec_par.h"
#include "libavcodec/defs.h"
#include "libavcodec/defs.h"
#include "libavcodec/itut35.h"
#include "libavcodec/xiph.h"
#include "libavcodec/xiph.h"
#include "libavcodec/mpeg4audio.h"
#include "libavcodec/mpeg4audio.h"
...
@@ -2824,8 +2825,8 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
...
@@ -2824,8 +2825,8 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
uint8_t
*
payload
=
t35_buf
;
uint8_t
*
payload
=
t35_buf
;
size_t
payload_size
=
sizeof
(
t35_buf
)
-
6
;
size_t
payload_size
=
sizeof
(
t35_buf
)
-
6
;
bytestream_put_byte
(
&
payload
,
0xB5
);
// country_code
bytestream_put_byte
(
&
payload
,
ITU_T_T35_COUNTRY_CODE_US
);
bytestream_put_be16
(
&
payload
,
0x3C
);
// provider_code
bytestream_put_be16
(
&
payload
,
ITU_T_T35_PROVIDER_CODE_SMTPE
);
bytestream_put_be16
(
&
payload
,
0x01
);
// provider_oriented_code
bytestream_put_be16
(
&
payload
,
0x01
);
// provider_oriented_code
bytestream_put_byte
(
&
payload
,
0x04
);
// application_identifier
bytestream_put_byte
(
&
payload
,
0x04
);
// application_identifier
...
...
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