virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Merge commit '11c5f438ff83da5040e85bfa6299f56b321d32ef'

Browse Source 
* commit '11c5f438ff83da5040e85bfa6299f56b321d32ef':
  dict: Change return type of av_dict_copy()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-14 14:01:11 +02:00
commit b994788353
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/APIchanges
View File

@ -15,6 +15,10 @@ libavutil: 2015-08-28
API changes, most recent first: API changes, most recent first:
2015-10-14 - xxxxxxx - lavu 55.4.100 / lavu 55.2.0 - dict.h
Change return type of av_dict_copy() from void to int, so that a proper
error code can be reported.
2015-09-29 - xxxxxxx - lavc 57.3.100 / lavc 57.2.0 - avcodec.h 2015-09-29 - xxxxxxx - lavc 57.3.100 / lavc 57.2.0 - avcodec.h
Change type of AVPacket.duration from int to int64_t. Change type of AVPacket.duration from int to int64_t.

11
libavutil/dict.c
View File

@ -210,12 +210,17 @@ void av_dict_free(AVDictionary **pm)
av_freep(pm); av_freep(pm);
} }
void av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags) int av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags)
{ {
AVDictionaryEntry *t = NULL; AVDictionaryEntry *t = NULL;
while ((t = av_dict_get(src, "", t, AV_DICT_IGNORE_SUFFIX))) while ((t = av_dict_get(src, "", t, AV_DICT_IGNORE_SUFFIX))) {
av_dict_set(dst, t->key, t->value, flags); int ret = av_dict_set(dst, t->key, t->value, flags);
if (ret < 0)
return ret;
}
return 0;
} }
int av_dict_get_string(const AVDictionary *m, char **buffer, int av_dict_get_string(const AVDictionary *m, char **buffer,

4
libavutil/dict.h
View File

@ -162,8 +162,10 @@ int av_dict_parse_string(AVDictionary **pm, const char *str,
* @param src pointer to source AVDictionary struct * @param src pointer to source AVDictionary struct
* @param flags flags to use when setting entries in *dst * @param flags flags to use when setting entries in *dst
* @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag
* @return 0 on success, negative AVERROR code on failure. If dst was allocated
* by this function, callers should free the associated memory.
*/ */
void av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags); int av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags);
/** /**
* Free all the memory allocated for an AVDictionary struct * Free all the memory allocated for an AVDictionary struct

2
libavutil/version.h
View File

@ -56,7 +56,7 @@
*/ */
#define LIBAVUTIL_VERSION_MAJOR 55 #define LIBAVUTIL_VERSION_MAJOR 55
#define LIBAVUTIL_VERSION_MINOR 3 #define LIBAVUTIL_VERSION_MINOR 4
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \