aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/dict.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-16 12:14:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-16 12:14:32 +0200
commit4195321a82c9db6111f9b5e0b755263f37a734e9 (patch)
tree544a46c9fe4a0725080e3e361037403b877ed04d /libavutil/dict.c
parent6bba6957858fe97bda8155dd8e6f857441410eed (diff)
parent4908c8ef2706d98022bf27a5c5bca1fe109e7529 (diff)
downloadffmpeg-4195321a82c9db6111f9b5e0b755263f37a734e9.tar.gz
Merge commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529'
* commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529': electronicarts: Improve some function/variable names Conflicts: libavformat/electronicarts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/dict.c')
0 files changed, 0 insertions, 0 deletions