aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-05 18:55:44 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-05 18:55:44 +0200
commit151f88d507f18c0aae011f9e88f40c508c11640f (patch)
treebc97245f85205bfb5417a1b1f2d3582691197bab /libavcodec/x86
parent27856b2fe9cdbcf48ad996647cb104667b373fa4 (diff)
parentd816e125fe1fa5c909b706d47904a4d6c1799996 (diff)
downloadffmpeg-151f88d507f18c0aae011f9e88f40c508c11640f.tar.gz
Merge commit 'd816e125fe1fa5c909b706d47904a4d6c1799996'
* commit 'd816e125fe1fa5c909b706d47904a4d6c1799996': dict: const correctness for av_dict_get() and av_dict_copy() Conflicts: libavutil/dict.c libavutil/dict.h See: e12a73246d8ce7d0fc4036522688934e26de4bb1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
0 files changed, 0 insertions, 0 deletions