summaryrefslogtreecommitdiffstats
path: root/media/libnestegg/src
diff options
context:
space:
mode:
authorJeroen Vreeken <jeroen@vreeken.net>2019-07-10 11:05:38 +0200
committerJeroen Vreeken <jeroen@vreeken.net>2019-07-10 11:08:09 +0200
commit18f9b185b67120ba88f5e643b7413ca06c497383 (patch)
treee07ea39a12a7d6b1e0b7c88cdaf2764ae2ba6836 /media/libnestegg/src
parentdd924323c3cda022493cd78d42da190577be20cf (diff)
downloadUXP-18f9b185b67120ba88f5e643b7413ca06c497383.tar
UXP-18f9b185b67120ba88f5e643b7413ca06c497383.tar.gz
UXP-18f9b185b67120ba88f5e643b7413ca06c497383.tar.lz
UXP-18f9b185b67120ba88f5e643b7413ca06c497383.tar.xz
UXP-18f9b185b67120ba88f5e643b7413ca06c497383.zip
Allow matroska mime types for video element and MSE
Allow avc (h.264) content in matroska/webm containers
Diffstat (limited to 'media/libnestegg/src')
-rw-r--r--media/libnestegg/src/nestegg.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/media/libnestegg/src/nestegg.c b/media/libnestegg/src/nestegg.c
index 61c30ec6b..6f0d55b46 100644
--- a/media/libnestegg/src/nestegg.c
+++ b/media/libnestegg/src/nestegg.c
@@ -157,6 +157,7 @@ enum ebml_type_enum {
#define TRACK_ID_AV1 "V_AV1"
#define TRACK_ID_VORBIS "A_VORBIS"
#define TRACK_ID_OPUS "A_OPUS"
+#define TRACK_ID_AVC1 "V_MPEG4/ISO/AVC"
/* Track Encryption */
#define CONTENT_ENC_ALGO_AES 5
@@ -2401,6 +2402,9 @@ nestegg_track_codec_id(nestegg * ctx, unsigned int track)
if (strcmp(codec_id, TRACK_ID_OPUS) == 0)
return NESTEGG_CODEC_OPUS;
+ if (strcmp(codec_id, TRACK_ID_AVC1) == 0)
+ return NESTEGG_CODEC_AVC1;
+
return NESTEGG_CODEC_UNKNOWN;
}
@@ -2459,7 +2463,8 @@ nestegg_track_codec_data(nestegg * ctx, unsigned int track, unsigned int item,
return -1;
if (nestegg_track_codec_id(ctx, track) != NESTEGG_CODEC_VORBIS &&
- nestegg_track_codec_id(ctx, track) != NESTEGG_CODEC_OPUS)
+ nestegg_track_codec_id(ctx, track) != NESTEGG_CODEC_OPUS &&
+ nestegg_track_codec_id(ctx, track) != NESTEGG_CODEC_AVC1)
return -1;
if (ne_get_binary(entry->codec_private, &codec_private) != 0)