apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-04-23 16:13:29 +08:00
Code Issues Packages Projects Releases Wiki 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
parent fcfb66ba9b 11c5f438ff
commit b994788353
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavutil/dict.c
+8 -3
View File
@@ -210,12 +210,17 @@ void av_dict_free(AVDictionary **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;
while ((t = av_dict_get(src, "", t, AV_DICT_IGNORE_SUFFIX)))
av_dict_set(dst, t->key, t->value, flags);
while ((t = av_dict_get(src, "", t, AV_DICT_IGNORE_SUFFIX))) {
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,