[FFmpeg-cvslog] avformat/smoothstreamingenc: refactor to use avutil/uuid
Pierre-Anthony Lemieux
git at videolan.org
Sun Jun 12 11:36:54 EEST 2022
ffmpeg | branch: master | Pierre-Anthony Lemieux <pal at palemieux.com> | Wed Jun 1 17:30:35 2022 -0700| [1fd6758178a692f71309f60581b0b26af72bc82d] | committer: Zane van Iperen
avformat/smoothstreamingenc: refactor to use avutil/uuid
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1fd6758178a692f71309f60581b0b26af72bc82d
---
libavformat/smoothstreamingenc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c
index 1713dd9009..ade6d5723b 100644
--- a/libavformat/smoothstreamingenc.c
+++ b/libavformat/smoothstreamingenc.c
@@ -34,6 +34,7 @@
#include "libavutil/opt.h"
#include "libavutil/avstring.h"
#include "libavutil/mathematics.h"
+#include "libavutil/uuid.h"
typedef struct Fragment {
int64_t start_time, duration;
@@ -416,13 +417,13 @@ static int parse_fragment(AVFormatContext *s, const char *filename, int64_t *sta
if (len < 8 || len >= *moof_size)
goto fail;
if (tag == MKTAG('u','u','i','d')) {
- static const uint8_t tfxd[] = {
+ static const AVUUID tfxd = {
0x6d, 0x1d, 0x9b, 0x05, 0x42, 0xd5, 0x44, 0xe6,
0x80, 0xe2, 0x14, 0x1d, 0xaf, 0xf7, 0x57, 0xb2
};
- uint8_t uuid[16];
+ AVUUID uuid;
avio_read(in, uuid, 16);
- if (!memcmp(uuid, tfxd, 16) && len >= 8 + 16 + 4 + 16) {
+ if (av_uuid_equal(uuid, tfxd) && len >= 8 + 16 + 4 + 16) {
avio_seek(in, 4, SEEK_CUR);
*start_ts = avio_rb64(in);
*duration = avio_rb64(in);
More information about the ffmpeg-cvslog
mailing list