-
Michael Niedermayer authored
* commit 'd816e125': dict: const correctness for av_dict_get() and av_dict_copy() Conflicts: libavutil/dict.c libavutil/dict.h See: e12a7324Merged-by: Michael Niedermayer <michaelni@gmx.at>
151f88d5
* commit 'd816e125': dict: const correctness for av_dict_get() and av_dict_copy() Conflicts: libavutil/dict.c libavutil/dict.h See: e12a7324Merged-by: Michael Niedermayer <michaelni@gmx.at>