File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1+ diff --git a/libavutil/dict.c b/libavutil/dict.c
2+ index f70c7e0..a53dc4a 100644
3+ --- /ffmpeg/libavutil/dict.c
4+ +++ /ffmpeg/libavutil/dict.c
5+ @@ -26,11 +26,6 @@
6+ #include "mem.h"
7+ #include "bprint.h"
8+
9+ -struct AVDictionary {
10+ - int count;
11+ - AVDictionaryEntry *elems;
12+ -};
13+ -
14+ int av_dict_count(const AVDictionary *m)
15+ {
16+ return m ? m->count : 0;
117diff --git a/libavutil/dict.h b/libavutil/dict.h
2- index 118f1f0..df4bd04 100644
18+ index 118f1f0..1659490 100644
319--- /ffmpeg/libavutil/dict.h
420+++ /ffmpeg/libavutil/dict.h
5- @@ -83,7 +83,8 @@ typedef struct AVDictionaryEntry {
21+ @@ -83,7 +83,10 @@ typedef struct AVDictionaryEntry {
622 char *value;
723 } AVDictionaryEntry;
824
925-typedef struct AVDictionary AVDictionary;
1026+typedef struct AVDictionary {
27+ + int count;
28+ + AVDictionaryEntry *elems;
1129+} AVDictionary;
1230
1331 /**
Original file line number Diff line number Diff line change 1+ diff --git a/libavutil/dict.c b/libavutil/dict.c
2+ index f70c7e0..a53dc4a 100644
3+ --- ffmpeg/libavutil/dict.c
4+ +++ ffmpeg/libavutil/dict.c
5+ @@ -26,11 +26,6 @@
6+ #include "mem.h"
7+ #include "bprint.h"
8+
9+ -struct AVDictionary {
10+ - int count;
11+ - AVDictionaryEntry *elems;
12+ -};
13+ -
14+ int av_dict_count(const AVDictionary *m)
15+ {
16+ return m ? m->count : 0;
117diff --git a/libavutil/dict.h b/libavutil/dict.h
2- index 118f1f0..df4bd04 100644
18+ index 118f1f0..1659490 100644
319--- ffmpeg/libavutil/dict.h
420+++ ffmpeg/libavutil/dict.h
5- @@ -83,7 +83,8 @@ typedef struct AVDictionaryEntry {
21+ @@ -83,7 +83,10 @@ typedef struct AVDictionaryEntry {
622 char *value;
723 } AVDictionaryEntry;
824
925-typedef struct AVDictionary AVDictionary;
1026+typedef struct AVDictionary {
27+ + int count;
28+ + AVDictionaryEntry *elems;
1129+} AVDictionary;
1230
1331 /**
Original file line number Diff line number Diff line change @@ -25,17 +25,34 @@ diff -u /usr/share/mingw-w64/include/servprov.h /usr/share/mingw-w64/include/ser
2525 };
2626 }
2727
28-
28+ diff --git a/libavutil/dict.c b/libavutil/dict.c
29+ index f70c7e0..a53dc4a 100644
30+ --- /ffmpeg/libavutil/dict.c
31+ +++ /ffmpeg/libavutil/dict.c
32+ @@ -26,11 +26,6 @@
33+ #include "mem.h"
34+ #include "bprint.h"
35+
36+ -struct AVDictionary {
37+ - int count;
38+ - AVDictionaryEntry *elems;
39+ -};
40+ -
41+ int av_dict_count(const AVDictionary *m)
42+ {
43+ return m ? m->count : 0;
2944diff --git a/libavutil/dict.h b/libavutil/dict.h
30- index 118f1f0..df4bd04 100644
45+ index 118f1f0..1659490 100644
3146--- /ffmpeg/libavutil/dict.h
3247+++ /ffmpeg/libavutil/dict.h
33- @@ -83,7 +83,8 @@ typedef struct AVDictionaryEntry {
48+ @@ -83,7 +83,10 @@ typedef struct AVDictionaryEntry {
3449 char *value;
3550 } AVDictionaryEntry;
3651
3752-typedef struct AVDictionary AVDictionary;
3853+typedef struct AVDictionary {
54+ + int count;
55+ + AVDictionaryEntry *elems;
3956+} AVDictionary;
4057
4158 /**
Original file line number Diff line number Diff line change @@ -853,6 +853,8 @@ typedef struct AVDictionaryEntry {
853853} AVDictionaryEntry;
854854
855855typedef struct AVDictionary {
856+ int count;
857+ AVDictionaryEntry *elems;
856858} AVDictionary;
857859
858860/* *
You can’t perform that action at this time.
0 commit comments